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

Cleaned up MusicService and fixed ISE and NPEs there. Replaced thread with handler for updating the progress bar in MusicControllerActivity for simplicity and performance.

Browse source
This commit is contained in:
Karim Abou Zeid 2015-06-19 12:29:40 +02:00
commit 049bf90620
3 changed files with 110 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/com/kabouzeid/gramophone/service/MultiPlayer.java
View file

@ -16,7 +16,7 @@ import com.kabouzeid.gramophone.util.PreferenceUtils;
import java.io.IOException;
import java.lang.ref.WeakReference;
public final class MultiPlayer implements MediaPlayer.OnErrorListener,
public class MultiPlayer implements MediaPlayer.OnErrorListener,
MediaPlayer.OnCompletionListener {
public static final String TAG = MultiPlayer.class.getSimpleName();
@ -234,8 +234,7 @@ public final class MultiPlayer implements MediaPlayer.OnErrorListener,
*/
@Override
public boolean onError(final MediaPlayer mp, final int what, final int extra) {
Toast.makeText(mService.get().getApplicationContext(), mService.get().getResources().getString(R.string.unplayable_file), Toast.LENGTH_SHORT).show();
mService.get().playNextSong(true);
Toast.makeText(mService.get(), mService.get().getResources().getString(R.string.unplayable_file), Toast.LENGTH_SHORT).show();
return false;
}

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

@ -308,35 +308,45 @@ public class MusicService extends Service {
playSongAt(getNextPosition(force));
}
private void openTrackAndPrepareNextAt(int position) {
private boolean openTrackAndPrepareNextAt(int position) {
synchronized (this) {
setPosition(position);
openCurrent();
boolean prepared = openCurrent();
prepareNext();
notifyChange(META_CHANGED);
return prepared;
}
}
private void openCurrent() {
private boolean openCurrent() {
synchronized (this) {
player.setDataSource(getTrackUri(getCurrentSong()));
try {
player.setDataSource(getTrackUri(getCurrentSong()));
return true;
} catch (Exception e) {
return false;
}
}
}
private void prepareNext() {
private boolean prepareNext() {
synchronized (this) {
nextPosition = getNextPosition(false);
player.setNextDataSource(getTrackUri(getSongAt(nextPosition)));
try {
int nextPosition = getNextPosition(false);
player.setNextDataSource(getTrackUri(getSongAt(nextPosition)));
this.nextPosition = nextPosition;
return true;
} catch (Exception e) {
return false;
}
}
}
private void closeAudioEffectSession() {
if (player != null) {
final Intent audioEffectsIntent = new Intent(AudioEffect.ACTION_CLOSE_AUDIO_EFFECT_CONTROL_SESSION);
audioEffectsIntent.putExtra(AudioEffect.EXTRA_AUDIO_SESSION, player.getAudioSessionId());
audioEffectsIntent.putExtra(AudioEffect.EXTRA_PACKAGE_NAME, getPackageName());
sendBroadcast(audioEffectsIntent);
}
final Intent audioEffectsIntent = new Intent(AudioEffect.ACTION_CLOSE_AUDIO_EFFECT_CONTROL_SESSION);
audioEffectsIntent.putExtra(AudioEffect.EXTRA_AUDIO_SESSION, player.getAudioSessionId());
audioEffectsIntent.putExtra(AudioEffect.EXTRA_PACKAGE_NAME, getPackageName());
sendBroadcast(audioEffectsIntent);
}
private boolean requestFocus() {
@ -344,7 +354,7 @@ public class MusicService extends Service {
}
private void updateRemoteControlClient() {
final Song song = playingQueue.get(getPosition());
final Song song = getCurrentSong();
remoteControlClient
.editMetadata(false)
.putString(MediaMetadataRetriever.METADATA_KEY_ARTIST, song.artistName)
@ -580,8 +590,11 @@ public class MusicService extends Service {
}
private void playSongAtImpl(int position) {
openTrackAndPrepareNextAt(position);
play(false);
if (openTrackAndPrepareNextAt(position)) {
play(false);
} else {
Toast.makeText(this, getResources().getString(R.string.unplayable_file), Toast.LENGTH_SHORT).show();
}
}
public void pause(boolean forceNoFading) {