Merge pull request #164 from grammatek/fix/varying_pitch

Use the voice settings for the pitch.

app/build.gradle

@@ -77,8 +77,8 @@ android {
         minSdkVersion 26
         compileSdkVersion 34
         targetSdkVersion 34
-        versionCode 35
-        versionName "2.0.3"
+        versionCode 36
+        versionName "2.0.4"
 
         testInstrumentationRunner  "androidx.test.runner.AndroidJUnitRunner"
         // testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

app/src/main/java/com/grammatek/simaromur/TTSService.java

@@ -145,12 +145,16 @@ protected void onSynthesizeText(SynthesisRequest request,
             Log.i(LOG_TAG, "onSynthesizeText: speechrate from settings: (" + settingsSpeechRate + ")");
             float clientSpeechRate = speechrate / (settingsSpeechRate / 100.0f);
             speechrate = (int) (adaptedSettingsSpeechRate * clientSpeechRate);
+            // Use the voice settings for the pitch. In contrast to the speech rate, the pitch is
+            // not changeable by e.g. TalkBack, but somehow, we get strange pitch variations via
+            // the request itself and cannot trust it. See also issue #24
+            pitch = Settings.Secure.getInt(getContentResolver(), Settings.Secure.TTS_DEFAULT_PITCH);
         } catch (Exception ex) {
             ex.printStackTrace();
         }
 
         Log.v(LOG_TAG, "onSynthesizeText: (" + language + "/" + country + "/" + variant
-                + "), callerUid: " + callerUid + " effective speed: " + speechrate + " pitch: " + pitch
+                + "), callerUid: " + callerUid + " effective speed: " + speechrate + ", effective pitch: " + pitch
                 + " bundle: " + params);
 
         String loadedVoiceName = mRepository.getLoadedVoiceName();