Funkwhale
/
ultrasonic-app-subsonic-android
mirror of https://github.com/ultrasonic/ultrasonic
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix remaining warnings in MediaPlayerLifecycleSupport

This commit is contained in:
tzugen 2021-05-21 19:20:21 +02:00
parent f596dc77c1
commit 05cb82921d
No known key found for this signature in database
GPG Key ID: 61E9C34BC10EC930
1 changed files with 77 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
ultrasonic/src/main/java/org/moire/ultrasonic/service/MediaPlayerLifecycleSupport.java
View File

@ -44,7 +44,7 @@ import org.moire.ultrasonic.util.Util;
public class MediaPlayerLifecycleSupport public class MediaPlayerLifecycleSupport
{ {
private boolean created = false; private boolean created = false;
private DownloadQueueSerializer downloadQueueSerializer; // From DI private final DownloadQueueSerializer downloadQueueSerializer; // From DI
private final MediaPlayerController mediaPlayerController; // From DI private final MediaPlayerController mediaPlayerController; // From DI
private final Downloader downloader; // From DI private final Downloader downloader; // From DI
@ -205,58 +205,55 @@ public class MediaPlayerLifecycleSupport
keyCode == KeyEvent.KEYCODE_MEDIA_NEXT); keyCode == KeyEvent.KEYCODE_MEDIA_NEXT);
// We can receive intents (e.g. MediaButton) when everything is stopped, so we need to start // We can receive intents (e.g. MediaButton) when everything is stopped, so we need to start
onCreate(autoStart, new Runnable() { onCreate(autoStart, () -> {
@Override switch (keyCode)
public void run() { {
switch (keyCode) case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:
{ case KeyEvent.KEYCODE_HEADSETHOOK:
case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE: mediaPlayerController.togglePlayPause();
case KeyEvent.KEYCODE_HEADSETHOOK: break;
mediaPlayerController.togglePlayPause(); case KeyEvent.KEYCODE_MEDIA_PREVIOUS:
break; mediaPlayerController.previous();
case KeyEvent.KEYCODE_MEDIA_PREVIOUS: break;
mediaPlayerController.previous(); case KeyEvent.KEYCODE_MEDIA_NEXT:
break; mediaPlayerController.next();
case KeyEvent.KEYCODE_MEDIA_NEXT: break;
mediaPlayerController.next(); case KeyEvent.KEYCODE_MEDIA_STOP:
break; mediaPlayerController.stop();
case KeyEvent.KEYCODE_MEDIA_STOP: break;
mediaPlayerController.stop(); case KeyEvent.KEYCODE_MEDIA_PLAY:
break; if (mediaPlayerController.getPlayerState() == PlayerState.IDLE)
case KeyEvent.KEYCODE_MEDIA_PLAY: {
if (mediaPlayerController.getPlayerState() == PlayerState.IDLE) mediaPlayerController.play();
{ }
mediaPlayerController.play(); else if (mediaPlayerController.getPlayerState() != PlayerState.STARTED)
} {
else if (mediaPlayerController.getPlayerState() != PlayerState.STARTED) mediaPlayerController.start();
{ }
mediaPlayerController.start(); break;
} case KeyEvent.KEYCODE_MEDIA_PAUSE:
break; mediaPlayerController.pause();
case KeyEvent.KEYCODE_MEDIA_PAUSE: break;
mediaPlayerController.pause(); case KeyEvent.KEYCODE_1:
break; mediaPlayerController.setSongRating(1);
case KeyEvent.KEYCODE_1: break;
mediaPlayerController.setSongRating(1); case KeyEvent.KEYCODE_2:
break; mediaPlayerController.setSongRating(2);
case KeyEvent.KEYCODE_2: break;
mediaPlayerController.setSongRating(2); case KeyEvent.KEYCODE_3:
break; mediaPlayerController.setSongRating(3);
case KeyEvent.KEYCODE_3: break;
mediaPlayerController.setSongRating(3); case KeyEvent.KEYCODE_4:
break; mediaPlayerController.setSongRating(4);
case KeyEvent.KEYCODE_4: break;
mediaPlayerController.setSongRating(4); case KeyEvent.KEYCODE_5:
break; mediaPlayerController.setSongRating(5);
case KeyEvent.KEYCODE_5: break;
mediaPlayerController.setSongRating(5); case KeyEvent.KEYCODE_STAR:
break; mediaPlayerController.toggleSongStarred();
case KeyEvent.KEYCODE_STAR: break;
mediaPlayerController.toggleSongStarred(); default:
break; break;
default:
break;
}
} }
}); });
} }
@ -278,36 +275,33 @@ public class MediaPlayerLifecycleSupport
intentAction.equals(Constants.CMD_NEXT)); intentAction.equals(Constants.CMD_NEXT));
// We can receive intents when everything is stopped, so we need to start // We can receive intents when everything is stopped, so we need to start
onCreate(autoStart, new Runnable() { onCreate(autoStart, () -> {
@Override switch(intentAction)
public void run() { {
switch(intentAction) case Constants.CMD_PLAY:
{ mediaPlayerController.play();
case Constants.CMD_PLAY: break;
mediaPlayerController.play(); case Constants.CMD_RESUME_OR_PLAY:
break; // If Ultrasonic wasn't running, the autoStart is enough to resume, no need to call anything
case Constants.CMD_RESUME_OR_PLAY: if (isRunning) mediaPlayerController.resumeOrPlay();
// If Ultrasonic wasn't running, the autoStart is enough to resume, no need to call anything break;
if (isRunning) mediaPlayerController.resumeOrPlay(); case Constants.CMD_NEXT:
break; mediaPlayerController.next();
case Constants.CMD_NEXT: break;
mediaPlayerController.next(); case Constants.CMD_PREVIOUS:
break; mediaPlayerController.previous();
case Constants.CMD_PREVIOUS: break;
mediaPlayerController.previous(); case Constants.CMD_TOGGLEPAUSE:
break; mediaPlayerController.togglePlayPause();
case Constants.CMD_TOGGLEPAUSE: break;
mediaPlayerController.togglePlayPause(); case Constants.CMD_STOP:
break; // TODO: There is a stop() function, shouldn't we use that?
case Constants.CMD_STOP: mediaPlayerController.pause();
// TODO: There is a stop() function, shouldn't we use that? mediaPlayerController.seekTo(0);
mediaPlayerController.pause(); break;
mediaPlayerController.seekTo(0); case Constants.CMD_PAUSE:
break; mediaPlayerController.pause();
case Constants.CMD_PAUSE: break;
mediaPlayerController.pause();
break;
}
} }
}); });
} }