Skip to content

Commit 92d488f

Browse files
authored
fix samplerate handling (#168)
* import samplerate fix in libpd, add 'Default' samplerate pref * version 1.4.1
1 parent 1121930 commit 92d488f

File tree

6 files changed

+11
-7
lines changed

6 files changed

+11
-7
lines changed

PdCore/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ allprojects {
2323
// These are specific to PdCore, but nexusPublishing needs them here:
2424
// https://github.com/gradle-nexus/publish-plugin/issues/84
2525
group = 'io.github.libpd.android'
26-
version = '1.4.0-SNAPSHOT'
26+
version = '1.4.1-SNAPSHOT'
2727

2828
// Create a Sonatype user token for these environment variables:
2929
// export ORG_GRADLE_PROJECT_sonatypeUsername="<tokenUsername>"

PdCore/pd-core/src/main/java/org/puredata/android/service/PdPreferences.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,14 @@ public static void initPreferences(Context context) {
6666
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
6767
if (!prefs.contains(res.getString(R.string.pref_key_srate))) {
6868
SharedPreferences.Editor editor = prefs.edit();
69-
int srate = PdBase.suggestSampleRate();
70-
editor.putString(res.getString(R.string.pref_key_srate), "" + ((srate > 0) ? srate : AudioParameters.suggestSampleRate()));
69+
70+
// init samplerate and audio device prefs to "Default":
71+
editor.putString(res.getString(R.string.pref_key_srate), res.getStringArray(R.array.srate_values)[0]);
7172
editor.putString(res.getString(R.string.pref_key_indevice), res.getStringArray(R.array.indevice_values)[0]);
73+
editor.putString(res.getString(R.string.pref_key_outdevice), res.getStringArray(R.array.outdevice_values)[0]);
74+
7275
int nic = PdBase.suggestInputChannels();
7376
editor.putString(res.getString(R.string.pref_key_inchannels), "" + ((nic > 0) ? nic : AudioParameters.suggestInputChannels()));
74-
editor.putString(res.getString(R.string.pref_key_outdevice), res.getStringArray(R.array.outdevice_values)[0]);
7577
int noc = PdBase.suggestOutputChannels();
7678
editor.putString(res.getString(R.string.pref_key_outchannels), "" + ((noc > 0) ? noc : AudioParameters.suggestOutputChannels()));
7779
editor.commit();

PdCore/pd-core/src/main/res/values/audio.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<string-array name="srate_labels">
4+
<item>Default</item>
45
<item>8000Hz</item>
56
<item>11025Hz</item>
67
<item>16000Hz</item>
@@ -10,6 +11,7 @@
1011
<item>48000Hz</item>
1112
</string-array>
1213
<string-array name="srate_values">
14+
<item>-1</item>
1315
<item>8000</item>
1416
<item>11025</item>
1517
<item>16000</item>

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ allprojects {
4545

4646
```gradle
4747
dependencies {
48-
implementation 'io.github.libpd.android:pd-core:1.4.0-SNAPSHOT'
48+
implementation 'io.github.libpd.android:pd-core:1.4.1-SNAPSHOT'
4949
}
5050
```
5151

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ ext {
2020
compileSdk = 34
2121
androidxLegacySupportVersion = '1.0.0'
2222
ndkVersion = libs.versions.ndk.get()
23-
pdCoreVersion = '1.4.0-SNAPSHOT' // Must match version in PdCore/build.gradle
23+
pdCoreVersion = '1.4.1-SNAPSHOT' // Must match version in PdCore/build.gradle
2424
}

0 commit comments

Comments
 (0)