From 6e135d8386e7614ab81c4d28792775aea041a605 Mon Sep 17 00:00:00 2001 From: Antoine Rousseau <_antoine_@metalu.net> Date: Sat, 13 Dec 2025 14:55:25 +0100 Subject: [PATCH 1/2] import samplerate fix in libpd, add 'Default' samplerate pref --- .../java/org/puredata/android/service/PdPreferences.java | 8 +++++--- PdCore/pd-core/src/main/jni/libpd | 2 +- PdCore/pd-core/src/main/res/values/audio.xml | 2 ++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/PdCore/pd-core/src/main/java/org/puredata/android/service/PdPreferences.java b/PdCore/pd-core/src/main/java/org/puredata/android/service/PdPreferences.java index 319922e7..8fe3fb6f 100644 --- a/PdCore/pd-core/src/main/java/org/puredata/android/service/PdPreferences.java +++ b/PdCore/pd-core/src/main/java/org/puredata/android/service/PdPreferences.java @@ -66,12 +66,14 @@ public static void initPreferences(Context context) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); if (!prefs.contains(res.getString(R.string.pref_key_srate))) { SharedPreferences.Editor editor = prefs.edit(); - int srate = PdBase.suggestSampleRate(); - editor.putString(res.getString(R.string.pref_key_srate), "" + ((srate > 0) ? srate : AudioParameters.suggestSampleRate())); + + // init samplerate and audio device prefs to "Default": + editor.putString(res.getString(R.string.pref_key_srate), res.getStringArray(R.array.srate_values)[0]); editor.putString(res.getString(R.string.pref_key_indevice), res.getStringArray(R.array.indevice_values)[0]); + editor.putString(res.getString(R.string.pref_key_outdevice), res.getStringArray(R.array.outdevice_values)[0]); + int nic = PdBase.suggestInputChannels(); editor.putString(res.getString(R.string.pref_key_inchannels), "" + ((nic > 0) ? nic : AudioParameters.suggestInputChannels())); - editor.putString(res.getString(R.string.pref_key_outdevice), res.getStringArray(R.array.outdevice_values)[0]); int noc = PdBase.suggestOutputChannels(); editor.putString(res.getString(R.string.pref_key_outchannels), "" + ((noc > 0) ? noc : AudioParameters.suggestOutputChannels())); editor.commit(); diff --git a/PdCore/pd-core/src/main/jni/libpd b/PdCore/pd-core/src/main/jni/libpd index 2ed8b39b..3067debb 160000 --- a/PdCore/pd-core/src/main/jni/libpd +++ b/PdCore/pd-core/src/main/jni/libpd @@ -1 +1 @@ -Subproject commit 2ed8b39ba0a82c27b9da087dac01d8e5ff55ee85 +Subproject commit 3067debb9dae42c747023bcf99beb4be287da7e6 diff --git a/PdCore/pd-core/src/main/res/values/audio.xml b/PdCore/pd-core/src/main/res/values/audio.xml index 7be836c8..55148430 100644 --- a/PdCore/pd-core/src/main/res/values/audio.xml +++ b/PdCore/pd-core/src/main/res/values/audio.xml @@ -1,6 +1,7 @@ + Default 8000Hz 11025Hz 16000Hz @@ -10,6 +11,7 @@ 48000Hz + -1 8000 11025 16000 From d66310fd87db2cb9673eff0e825fa824f585dc23 Mon Sep 17 00:00:00 2001 From: Antoine Rousseau <_antoine_@metalu.net> Date: Sat, 13 Dec 2025 14:58:37 +0100 Subject: [PATCH 2/2] version 1.4.1 --- PdCore/build.gradle | 2 +- README.md | 2 +- build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PdCore/build.gradle b/PdCore/build.gradle index 776de94b..5af14736 100644 --- a/PdCore/build.gradle +++ b/PdCore/build.gradle @@ -23,7 +23,7 @@ allprojects { // These are specific to PdCore, but nexusPublishing needs them here: // https://github.com/gradle-nexus/publish-plugin/issues/84 group = 'io.github.libpd.android' -version = '1.4.0-SNAPSHOT' +version = '1.4.1-SNAPSHOT' // Create a Sonatype user token for these environment variables: // export ORG_GRADLE_PROJECT_sonatypeUsername="" diff --git a/README.md b/README.md index 243a6a60..73f1bb98 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ allprojects { ```gradle dependencies { - implementation 'io.github.libpd.android:pd-core:1.4.0-SNAPSHOT' + implementation 'io.github.libpd.android:pd-core:1.4.1-SNAPSHOT' } ``` diff --git a/build.gradle b/build.gradle index 80c075ba..fa3c90e0 100644 --- a/build.gradle +++ b/build.gradle @@ -20,5 +20,5 @@ ext { compileSdk = 34 androidxLegacySupportVersion = '1.0.0' ndkVersion = libs.versions.ndk.get() - pdCoreVersion = '1.4.0-SNAPSHOT' // Must match version in PdCore/build.gradle + pdCoreVersion = '1.4.1-SNAPSHOT' // Must match version in PdCore/build.gradle }