Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3402 from ByteHamster/audiofocus-gain-continue

Browse Source 
Restart service when re-gaining audio focus
This commit is contained in:
H. Lehmann 2019-09-10 23:56:28 +02:00 committed by GitHub
commit 204e759136
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/main/java/de/danoeh/antennapod/core/service/playback/LocalPSMP.java
View File

@ -12,6 +12,7 @@ import android.util.Log;
import android.util.Pair; import android.util.Pair;
import android.view.SurfaceHolder; import android.view.SurfaceHolder;
import de.danoeh.antennapod.core.util.playback.PlaybackServiceStarter;
import org.antennapod.audio.MediaPlayer; import org.antennapod.audio.MediaPlayer;
import java.io.File; import java.io.File;
@ -705,7 +706,6 @@ public class LocalPSMP extends PlaybackServiceMediaPlayer {
*/ */
@Override @Override
public void shutdown() { public void shutdown() {
abandonAudioFocus();
executor.shutdown(); executor.shutdown();
if (mediaPlayer != null) { if (mediaPlayer != null) {
try { try {
@ -839,6 +839,19 @@ public class LocalPSMP extends PlaybackServiceMediaPlayer {
@Override @Override
public void onAudioFocusChange(final int focusChange) { public void onAudioFocusChange(final int focusChange) {
if (!PlaybackService.isRunning) {
abandonAudioFocus();
Log.d(TAG, "onAudioFocusChange: PlaybackService is no longer running");
if (focusChange == AudioManager.AUDIOFOCUS_GAIN && pausedBecauseOfTransientAudiofocusLoss) {
new PlaybackServiceStarter(context, getPlayable())
.startWhenPrepared(true)
.streamIfLastWasStream()
.callEvenIfRunning(false)
.start();
}
return;
}
executor.submit(() -> { executor.submit(() -> {
playerLock.lock(); playerLock.lock();