Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
740e81e1e2
4 changed files with 5 additions and 4 deletions
|
@ -448,7 +448,8 @@ public class MapActivityActions implements DialogProvider {
|
|||
ApplicationMode mode = getRouteMode(null);
|
||||
//app.getSettings().APPLICATION_MODE.set(mode);
|
||||
app.getRoutingHelper().setAppMode(mode);
|
||||
app.initVoiceCommandPlayer(mapActivity, true, null, false, false);
|
||||
//Test for #2810: No need to init player here?
|
||||
//app.initVoiceCommandPlayer(mapActivity, true, null, false, false);
|
||||
// save application mode controls
|
||||
settings.FOLLOW_THE_ROUTE.set(false);
|
||||
app.getRoutingHelper().setFollowingMode(false);
|
||||
|
|
|
@ -60,7 +60,7 @@ public abstract class AbstractPrologCommandPlayer implements CommandPlayer, Stat
|
|||
private static final String WEAR_ALERT = "WEAR_ALERT";
|
||||
/** Must be sorted array! */
|
||||
private final int[] sortedVoiceVersions;
|
||||
private AudioFocusHelper mAudioFocusHelper;
|
||||
private static AudioFocusHelper mAudioFocusHelper;
|
||||
protected String language = "";
|
||||
protected int streamType;
|
||||
private int currentVersion;
|
||||
|
|
|
@ -28,7 +28,7 @@ public class MediaCommandPlayerImpl extends AbstractPrologCommandPlayer implemen
|
|||
private static final Log log = PlatformUtil.getLog(MediaCommandPlayerImpl.class);
|
||||
|
||||
// playing media
|
||||
private MediaPlayer mediaPlayer;
|
||||
private static MediaPlayer mediaPlayer;
|
||||
// indicates that player is ready to play first file
|
||||
private List<String> filesToPlay = Collections.synchronizedList(new ArrayList<String>());
|
||||
private VoiceRouter vrt;
|
||||
|
|
|
@ -62,7 +62,7 @@ public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer {
|
|||
private static final int[] TTS_VOICE_VERSION = new int[] { 102, 103 }; // !! MUST BE SORTED
|
||||
// TTS any more 101 because of to much changes
|
||||
private static final Log log = PlatformUtil.getLog(TTSCommandPlayerImpl.class);
|
||||
private TextToSpeech mTts;
|
||||
private static TextToSpeech mTts;
|
||||
private Context mTtsContext;
|
||||
private HashMap<String, String> params = new HashMap<String, String>();
|
||||
private VoiceRouter vrt;
|
||||
|
|
Loading…
Reference in a new issue