Skip to content

Commit

Permalink
Merge pull request #210 from jakobkukla/new-refactor-musicservice
Browse files Browse the repository at this point in the history 
Refactor: MusicService
  • Loading branch information
@dkanada
dkanada authored May 1, 2022
2 parents a555640 + d1b7b5f commit 0233e12
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 121 deletions.
18 changes: 4 additions & 14 deletions app/src/main/java/com/dkanada/gramophone/helper/MusicPlayerRemote.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,6 @@ public static void playSongAt(final int position) {
}
}

public static void setPosition(final int position) {
if (musicService != null) {
musicService.setPosition(position);
}
}

public static void pauseSong() {
if (musicService != null) {
musicService.pause();
Expand Down Expand Up @@ -148,7 +142,7 @@ public static void resumePlaying() {
}

public static void openQueue(final List<Song> queue, final int startPosition, final boolean startPlaying) {
if (!tryToHandleOpenPlayingQueue(queue, startPosition, startPlaying) && musicService != null) {
if (!tryToHandleOpenPlayingQueue(queue, startPosition) && musicService != null) {
musicService.openQueue(queue, startPosition, startPlaying);
if (!PreferenceUtil.getInstance(musicService).getRememberShuffle()){
setShuffleMode(QueueManager.SHUFFLE_MODE_NONE);
Expand All @@ -162,19 +156,15 @@ public static void openAndShuffleQueue(final List<Song> queue, boolean startPlay
startPosition = new Random().nextInt(queue.size());
}

if (!tryToHandleOpenPlayingQueue(queue, startPosition, startPlaying) && musicService != null) {
if (!tryToHandleOpenPlayingQueue(queue, startPosition) && musicService != null) {
openQueue(queue, startPosition, startPlaying);
setShuffleMode(QueueManager.SHUFFLE_MODE_SHUFFLE);
}
}

private static boolean tryToHandleOpenPlayingQueue(final List<Song> queue, final int startPosition, final boolean startPlaying) {
private static boolean tryToHandleOpenPlayingQueue(final List<Song> queue, final int startPosition) {
if (getPlayingQueue() == queue) {
if (startPlaying) {
playSongAt(startPosition);
} else {
setPosition(startPosition);
}
playSongAt(startPosition);

return true;
}
Expand Down
167 changes: 62 additions & 105 deletions app/src/main/java/com/dkanada/gramophone/service/MusicService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
import static com.google.android.exoplayer2.Player.MEDIA_ITEM_TRANSITION_REASON_PLAYLIST_CHANGED;
import static com.google.android.exoplayer2.Player.PLAY_WHEN_READY_CHANGE_REASON_END_OF_MEDIA_ITEM;

public class MusicService extends Service implements SharedPreferences.OnSharedPreferenceChangeListener, Playback.PlaybackCallbacks {
public class MusicService extends Service implements SharedPreferences.OnSharedPreferenceChangeListener {
public static final String PACKAGE_NAME = BuildConfig.APPLICATION_ID;

public static final String ACTION_TOGGLE = PACKAGE_NAME + ".toggle";
Expand Down Expand Up @@ -103,10 +103,8 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
public static final int TRACK_CHANGED = 1;
public static final int TRACK_ENDED = 2;

public static final int RELEASE_WAKELOCK = 0;
public static final int PLAY_SONG = 3;
public static final int PREPARE_NEXT = 4;
public static final int SET_POSITION = 5;

public static final int SAVE_QUEUE = 0;
public static final int LOAD_QUEUE = 9;
Expand All @@ -123,7 +121,6 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP

public QueueManager queueManager;

private boolean notHandledMetaChangedForCurrentTrack;
private boolean queuesRestored;

private PlayingNotification playingNotification;
Expand Down Expand Up @@ -159,6 +156,41 @@ public void onShuffleModeChanged() {
}
};

private final Playback.PlaybackCallbacks playbackCallbacks = new Playback.PlaybackCallbacks() {
@Override
public void onStateChanged(int state) {
notifyChange(STATE_CHANGED);
}

@Override
public void onReadyChanged(boolean ready, int reason) {
notifyChange(STATE_CHANGED);

if (ready) {
progressHandler.sendEmptyMessage(TRACK_STARTED);
prepareNext();
} else if (reason == PLAY_WHEN_READY_CHANGE_REASON_END_OF_MEDIA_ITEM) {
progressHandler.sendEmptyMessage(TRACK_ENDED);
}
}

@Override
public void onTrackChanged(int reason) {
acquireWakeLock(30000);

if (reason == MEDIA_ITEM_TRANSITION_REASON_AUTO) {
playerHandler.sendEmptyMessage(TRACK_CHANGED);
progressHandler.sendEmptyMessage(TRACK_CHANGED);
} else if (reason == MEDIA_ITEM_TRANSITION_REASON_PLAYLIST_CHANGED) {
progressHandler.sendEmptyMessage(TRACK_CHANGED);
prepareNext();
}

notifyChange(STATE_CHANGED);
notifyChange(META_CHANGED);
}
};

private final BroadcastReceiver becomingNoisyReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, @NonNull Intent intent) {
Expand Down Expand Up @@ -205,7 +237,7 @@ public void onCreate() {
wakeLock.setReferenceCounted(false);

playback = new LocalPlayer(this);
playback.setCallbacks(this);
playback.setCallbacks(playbackCallbacks);

queueManager = new QueueManager(this, queueCallbacks);

Expand All @@ -221,7 +253,7 @@ public void onCreate() {
queueHandlerThread.start();
queueHandler = new QueueHandler(this, queueHandlerThread.getLooper());

throttledSeekHandler = new ThrottledSeekHandler(playerHandler);
throttledSeekHandler = new ThrottledSeekHandler(new Handler());
uiThreadHandler = new Handler();

registerReceiver(widgetIntentReceiver, new IntentFilter(INTENT_EXTRA_WIDGET_UPDATE));
Expand Down Expand Up @@ -423,7 +455,6 @@ private synchronized void restoreQueuesAndPositionIfNecessary() {

if (restoredProgress > 0) seek(restoredProgress);

notHandledMetaChangedForCurrentTrack = true;
handleChangeInternal(META_CHANGED);
handleChangeInternal(QUEUE_CHANGED);
}
Expand Down Expand Up @@ -466,38 +497,29 @@ public void playNextSong(boolean force) {
playSongAt(queueManager.getNextPosition(force));
}

private void openTrackAndPrepareNextAt(int position) {
synchronized (this) {
queueManager.position = position;

openCurrent();
playback.start();
private synchronized void openTrackAndPrepareNextAt(int position) {
queueManager.position = position;

notifyChange(META_CHANGED);
notHandledMetaChangedForCurrentTrack = false;
}
openCurrent();
playback.start();
}

private void openCurrent() {
synchronized (this) {
if (queueManager.getCurrentSong() == null) return;
private synchronized void openCurrent() {
if (queueManager.getCurrentSong() == null) return;

playback.setDataSource(queueManager.getCurrentSong());
}
playback.setDataSource(queueManager.getCurrentSong());
}

private void prepareNext() {
playerHandler.removeMessages(PREPARE_NEXT);
playerHandler.obtainMessage(PREPARE_NEXT).sendToTarget();
}

private void prepareNextImpl() {
synchronized (this) {
if (queueManager.getCurrentSong() == null) return;
private synchronized void prepareNextImpl() {
if (queueManager.getCurrentSong() == null) return;

queueManager.nextPosition = queueManager.getNextPosition(false);
playback.queueDataSource(queueManager.getSongAt(queueManager.nextPosition));
}
queueManager.nextPosition = queueManager.getNextPosition(false);
playback.queueDataSource(queueManager.getSongAt(queueManager.nextPosition));
}

public void initNotification() {
Expand Down Expand Up @@ -606,11 +628,7 @@ public void openQueue(@Nullable final List<Song> playingQueue, final int startPo
position = 0;
}

if (startPlaying) {
playSongAt(position);
} else {
setPosition(position);
}
playSongAt(position);

notifyChange(QUEUE_CHANGED);
}
Expand All @@ -622,37 +640,18 @@ public void playSongAt(final int position) {
playerHandler.obtainMessage(PLAY_SONG, position, 0).sendToTarget();
}

public void setPosition(final int position) {
// handle this on the handlers thread to avoid blocking the ui thread
playerHandler.removeMessages(SET_POSITION);
playerHandler.obtainMessage(SET_POSITION, position, 0).sendToTarget();
}

private void playSongAtImpl(int position) {
openTrackAndPrepareNextAt(position);
}

public void pause() {
if (playback.isPlaying()) {
playback.pause();
notifyChange(STATE_CHANGED);
}
}

public void play() {
synchronized (this) {
if (!playback.isPlaying()) {
if (!playback.isReady()) {
playSongAt(queueManager.position);
} else {
playback.start();
if (notHandledMetaChangedForCurrentTrack) {
handleChangeInternal(META_CHANGED);
notHandledMetaChangedForCurrentTrack = false;
}

notifyChange(STATE_CHANGED);
}
public synchronized void play() {
if (!playback.isPlaying()) {
if (!playback.isReady()) {
playSongAt(queueManager.position);
} else {
playback.start();
}
}
}
Expand All @@ -677,12 +676,10 @@ public int getSongDurationMillis() {
return playback.getDuration();
}

public int seek(int millis) {
synchronized (this) {
playback.setProgress(millis);
throttledSeekHandler.notifySeek();
return millis;
}
public synchronized int seek(int millis) {
playback.setProgress(millis);
throttledSeekHandler.notifySeek();
return millis;
}

private void notifyChange(@NonNull final String what) {
Expand Down Expand Up @@ -760,36 +757,6 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
}
}

@Override
public void onStateChanged(int state) {
notifyChange(STATE_CHANGED);
}

@Override
public void onReadyChanged(boolean ready, int reason) {
notifyChange(STATE_CHANGED);

if (ready) {
progressHandler.sendEmptyMessage(TRACK_STARTED);
prepareNext();
} else if (reason == PLAY_WHEN_READY_CHANGE_REASON_END_OF_MEDIA_ITEM) {
progressHandler.sendEmptyMessage(TRACK_ENDED);
}
}

@Override
public void onTrackChanged(int reason) {
acquireWakeLock(30000);

if (reason == MEDIA_ITEM_TRANSITION_REASON_AUTO) {
playerHandler.sendEmptyMessage(TRACK_CHANGED);
progressHandler.sendEmptyMessage(TRACK_CHANGED);
} else if (reason == MEDIA_ITEM_TRANSITION_REASON_PLAYLIST_CHANGED) {
progressHandler.sendEmptyMessage(TRACK_CHANGED);
prepareNext();
}
}

private static final class PlaybackHandler extends Handler {
private final WeakReference<MusicService> mService;

Expand All @@ -810,16 +777,16 @@ public void handleMessage(@NonNull final Message msg) {
if (service.queueManager.getRepeatMode() == QueueManager.REPEAT_MODE_NONE && service.queueManager.isLastTrack()) {
service.pause();
service.seek(0);
service.notifyChange(STATE_CHANGED);
} else {
service.queueManager.position = service.queueManager.nextPosition;
service.prepareNextImpl();
service.notifyChange(META_CHANGED);
service.notifyChange(QUEUE_CHANGED);
}
break;

case TRACK_ENDED:
// FIXME This isn't used anywhere. This means releaseWakeLock() is never called

// if there is a timer finished, don't continue
if (service.pendingQuit || service.queueManager.getRepeatMode() == QueueManager.REPEAT_MODE_NONE && service.queueManager.isLastTrack()) {
service.notifyChange(STATE_CHANGED);
Expand All @@ -833,21 +800,11 @@ public void handleMessage(@NonNull final Message msg) {
service.playNextSong(false);
}

sendEmptyMessage(RELEASE_WAKELOCK);
break;

case RELEASE_WAKELOCK:
service.releaseWakeLock();
break;

case PLAY_SONG:
service.playSongAtImpl(msg.arg1);
service.notifyChange(STATE_CHANGED);
break;

case SET_POSITION:
service.openTrackAndPrepareNextAt(msg.arg1);
service.notifyChange(STATE_CHANGED);
break;

case PREPARE_NEXT:
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/dkanada/gramophone/service/QueueManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,9 +215,9 @@ private void reposition(int deletedPosition) {
position = currentPosition - 1;
} else if (deletedPosition == currentPosition) {
if (playingQueue.size() > deletedPosition) {
MusicPlayerRemote.setPosition(position);
MusicPlayerRemote.playSongAt(position);
} else {
MusicPlayerRemote.setPosition(position - 1);
MusicPlayerRemote.playSongAt(position - 1);
}
}
}
Expand Down

0 comments on commit 0233e12

Please sign in to comment.