From 426af41f2cca39e97590493e2f43d1b17b2cd47e Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Wed, 20 Nov 2019 19:27:24 +0100 Subject: [PATCH] Move TTS stream definition into one place. --- src/main/java/de/dennisguse/opentracks/AbstractActivity.java | 5 +++-- .../opentracks/services/tasks/AnnouncementPeriodicTask.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/dennisguse/opentracks/AbstractActivity.java b/src/main/java/de/dennisguse/opentracks/AbstractActivity.java index c06f4fd81..f9ac209f5 100644 --- a/src/main/java/de/dennisguse/opentracks/AbstractActivity.java +++ b/src/main/java/de/dennisguse/opentracks/AbstractActivity.java @@ -17,11 +17,12 @@ package de.dennisguse.opentracks; import android.os.Bundle; -import android.speech.tts.TextToSpeech; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; +import de.dennisguse.opentracks.util.TTSUtils; + /** * @author Jimmy Shih */ @@ -32,7 +33,7 @@ public abstract class AbstractActivity extends AppCompatActivity { super.onCreate(savedInstanceState); // Set volume control stream for text to speech - setVolumeControlStream(TextToSpeech.Engine.DEFAULT_STREAM); + setVolumeControlStream(TTSUtils.getTTSStream()); setContentView(getLayoutResId()); diff --git a/src/main/java/de/dennisguse/opentracks/services/tasks/AnnouncementPeriodicTask.java b/src/main/java/de/dennisguse/opentracks/services/tasks/AnnouncementPeriodicTask.java index e4d0c7ddb..d64c994d3 100644 --- a/src/main/java/de/dennisguse/opentracks/services/tasks/AnnouncementPeriodicTask.java +++ b/src/main/java/de/dennisguse/opentracks/services/tasks/AnnouncementPeriodicTask.java @@ -34,6 +34,7 @@ import de.dennisguse.opentracks.services.TrackRecordingService; import de.dennisguse.opentracks.stats.TripStatistics; import de.dennisguse.opentracks.util.PreferencesUtils; import de.dennisguse.opentracks.util.StringUtils; +import de.dennisguse.opentracks.util.TTSUtils; import de.dennisguse.opentracks.util.UnitConversions; /** @@ -193,7 +194,7 @@ public class AnnouncementPeriodicTask implements PeriodicTask { * @param announcement the announcement */ private void speakAnnouncement(String announcement) { - int result = audioManager.requestAudioFocus(null, TextToSpeech.Engine.DEFAULT_STREAM, AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK); + int result = audioManager.requestAudioFocus(null, TTSUtils.getTTSStream(), AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK); if (result == AudioManager.AUDIOFOCUS_REQUEST_FAILED) { Log.w(TAG, "Failed to request audio focus."); }