Skip to content
Snippets Groups Projects
Commit 63f5d6c0 authored by Geoffrey Métais's avatar Geoffrey Métais
Browse files

Pause playback instead of ducking on Android TV

parent 8c3af754
No related branches found
No related tags found
No related merge requests found
......@@ -407,23 +407,14 @@ public class PlaybackService extends MediaBrowserServiceCompat implements IVLCVo
case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT:
Log.i(TAG, "AUDIOFOCUS_LOSS_TRANSIENT");
// Pause playback
mLossTransient = true;
wasPlaying = isPlaying();
if (wasPlaying)
pause();
pausePlayback();
break;
case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK:
Log.i(TAG, "AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK");
// Lower the volume
if (isPlaying()) {
if (AndroidDevices.isAndroidTv) {
final int volume = getVolume();
if (audioDuckLevel == -1)
audioDuckLevel = 20;
if (volume > audioDuckLevel) {
mLossTransientVolume = volume;
mAudioManager.setStreamVolume(AudioManager.STREAM_MUSIC, audioDuckLevel, 0);
}
pausePlayback();
} else {
final int volume = mAudioManager.getStreamVolume(AudioManager.STREAM_MUSIC);
if (audioDuckLevel == -1)
......@@ -439,11 +430,7 @@ public class PlaybackService extends MediaBrowserServiceCompat implements IVLCVo
Log.i(TAG, "AUDIOFOCUS_GAIN: ");
// Resume playback
if (mLossTransientVolume != -1) {
if (AndroidDevices.isAndroidTv) {
setVolume(mLossTransientVolume);
} else {
mAudioManager.setStreamVolume(AudioManager.STREAM_MUSIC, mLossTransientVolume, 0);
}
mAudioManager.setStreamVolume(AudioManager.STREAM_MUSIC, mLossTransientVolume, 0);
mLossTransientVolume = -1;
}
if (mLossTransient) {
......@@ -454,6 +441,13 @@ public class PlaybackService extends MediaBrowserServiceCompat implements IVLCVo
break;
}
}
private void pausePlayback() {
mLossTransient = true;
wasPlaying = isPlaying();
if (wasPlaying)
pause();
}
};
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment