tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improved performance when starting music playback.

Browse source
This commit is contained in:
Karim Abou Zeid 2015-08-23 17:45:20 +02:00
commit c2586943d3
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
View file

@ -91,6 +91,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
public static final int TRACK_WENT_TO_NEXT = 12; public static final int TRACK_WENT_TO_NEXT = 12;
public static final int PLAY_SONG = 13; public static final int PLAY_SONG = 13;
public static final int SAVE_QUEUES = 14; public static final int SAVE_QUEUES = 14;
public static final int PREPARE_NEXT = 15;
public static final int SHUFFLE_MODE_NONE = 0; public static final int SHUFFLE_MODE_NONE = 0;
public static final int SHUFFLE_MODE_SHUFFLE = 1; public static final int SHUFFLE_MODE_SHUFFLE = 1;
public static final int REPEAT_MODE_NONE = 0; public static final int REPEAT_MODE_NONE = 0;
@ -379,7 +380,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
synchronized (this) { synchronized (this) {
setPosition(position); setPosition(position);
boolean prepared = openCurrent(); boolean prepared = openCurrent();
if (prepared) prepareNext(); if (prepared) prepareNextImpl();
notifyChange(META_CHANGED); notifyChange(META_CHANGED);
notHandledMetaChangedForCurrentTrack = false; notHandledMetaChangedForCurrentTrack = false;
return prepared; return prepared;
@ -396,7 +397,12 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
} }
} }
private boolean prepareNext() { private void prepareNext() {
playerHandler.removeMessages(PREPARE_NEXT);
playerHandler.obtainMessage(PREPARE_NEXT).sendToTarget();
}
private boolean prepareNextImpl() {
synchronized (this) { synchronized (this) {
try { try {
int nextPosition = getNextPosition(false); int nextPosition = getNextPosition(false);
@ -950,7 +956,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
service.seek(0); service.seek(0);
} else { } else {
service.setPosition(service.nextPosition); service.setPosition(service.nextPosition);
service.prepareNext(); service.prepareNextImpl();
service.notifyChange(META_CHANGED); service.notifyChange(META_CHANGED);
} }
break; break;
@ -972,6 +978,10 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
service.playSongAtImpl(msg.arg1); service.playSongAtImpl(msg.arg1);
break; break;
case PREPARE_NEXT:
service.prepareNextImpl();
break;
case FOCUS_CHANGE: case FOCUS_CHANGE:
switch (msg.arg1) { switch (msg.arg1) {
case AudioManager.AUDIOFOCUS_GAIN: case AudioManager.AUDIOFOCUS_GAIN: