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

Bug fixing

Browse source 
- clean ups
- media player null pointer bug fixed
- async playing queue saving working now
This commit is contained in:
Karim Abou Zeid 2015-01-27 13:53:46 +01:00
commit 594a328311
3 changed files with 54 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/kabouzeid/materialmusic/helper/MusicPlayerRemote.java
View file

@ -193,10 +193,6 @@ public class MusicPlayerRemote implements OnMusicRemoteEventListener {
return false;
}
public void notifyPlayingQueueChanged() {
final long currentSongId = getCurrentSongId();
}
public int getRepeatMode() {
if (musicBound) {
return musicService.getRepeatMode();

48
app/src/main/java/com/kabouzeid/materialmusic/service/MusicService.java
View file

@ -66,6 +66,8 @@ public class MusicService extends Service implements MediaPlayer.OnPreparedListe
private boolean isPlayerPrepared;
private boolean wasPlayingBeforeFocusLoss;
private boolean thingsRegistered;
private boolean saveQueuesAgain;
private boolean isSavingQueues;
private NotificationHelper notificationHelper;
private AudioManager audioManager;
private RemoteControlClient remoteControlClient;
@ -105,7 +107,7 @@ public class MusicService extends Service implements MediaPlayer.OnPreparedListe
}
private boolean requestFocus() {
int result = audioManager.requestAudioFocus(this, AudioManager.STREAM_MUSIC,
int result = getAudioManager().requestAudioFocus(this, AudioManager.STREAM_MUSIC,
AudioManager.AUDIOFOCUS_GAIN);
return (result == AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
@ -140,11 +142,13 @@ public class MusicService extends Service implements MediaPlayer.OnPreparedListe
unregisterReceiver(receiver);
getAudioManager().unregisterRemoteControlClient(remoteControlClient);
getAudioManager().unregisterMediaButtonEventReceiver(new ComponentName(getApplicationContext(), MediaButtonIntentReceiver.class));
getAudioManager().abandonAudioFocus(this);
thingsRegistered = false;
}
}
private void updateRemoteControlClient(Song song) {
private void updateRemoteControlClient() {
Song song = getPlayingQueue().get(getPosition());
Bitmap loadedImage = ImageLoader.getInstance().loadImageSync(MusicUtil.getAlbumArtUri(song.albumId).toString());
remoteControlClient
.editMetadata(false)
@ -243,10 +247,10 @@ public class MusicService extends Service implements MediaPlayer.OnPreparedListe
}
private void killEverythingAndReleaseResources() {
savePosition();
saveQueues();
stopPlaying();
notificationHelper.killNotification();
savePosition();
saveQueues();
stopSelf();
}
@ -312,18 +316,20 @@ public class MusicService extends Service implements MediaPlayer.OnPreparedListe
case AudioManager.AUDIOFOCUS_GAIN:
// resume playback
registerEverything();
if (!isPlayerPrepared()) {
setUpMediaPlayerIfNeeded();
}
player.setVolume(1.0f, 1.0f);
if (wasPlayingBeforeFocusLoss) {
resumePlaying();
updateRemoteControlClient(getPlayingQueue().get(getPosition()));
}
updateRemoteControlClient(getPlayingQueue().get(getPosition()));
updateRemoteControlClient();
break;
case AudioManager.AUDIOFOCUS_LOSS:
// Lost focus for an unbounded amount of time: stop playback and release media player
//TODO maybe also release player
wasPlayingBeforeFocusLoss = isPlaying();
//TODO maybe also release player (stopPlaying()) but the the current position in the song is 0 again
wasPlayingBeforeFocusLoss = false;
pausePlaying();
unregisterEverything();
break;
@ -339,6 +345,9 @@ public class MusicService extends Service implements MediaPlayer.OnPreparedListe
case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK:
// Lost focus for a short time, but it's ok to keep playing
// at an attenuated level
if (!isPlayerPrepared()) {
setUpMediaPlayerIfNeeded();
}
player.setVolume(0.2f, 0.2f);
break;
}
@ -370,7 +379,7 @@ public class MusicService extends Service implements MediaPlayer.OnPreparedListe
player.setDataSource(getApplicationContext(), trackUri);
currentSongId = getPlayingQueue().get(getPosition()).id;
updateNotification();
updateRemoteControlClient(getPlayingQueue().get(getPosition()));
updateRemoteControlClient();
player.prepareAsync();
} catch (Exception e) {
Log.e("MUSIC SERVICE", "Error setting data source", e);
@ -531,14 +540,29 @@ public class MusicService extends Service implements MediaPlayer.OnPreparedListe
}
public void saveState() {
saveQueues();
saveQueuesAsync();
savePosition();
}
public void saveQueues() {
public void saveQueuesAsync() {
if (isSavingQueues) {
saveQueuesAgain = true;
} else {
new Thread(new Runnable() {
@Override
public void run() {
isSavingQueues = true;
do {
saveQueuesAgain = false;
saveQueues();
} while (saveQueuesAgain);
isSavingQueues = false;
}
}).start();
}
}
public void saveQueues() {
try {
InternalStorageUtil.writeObject(MusicService.this, AppKeys.IS_PLAYING_QUEUE, playingQueue);
InternalStorageUtil.writeObject(MusicService.this, AppKeys.IS_ORIGINAL_PLAYING_QUEUE, originalPlayingQueue);
@ -547,8 +571,6 @@ public class MusicService extends Service implements MediaPlayer.OnPreparedListe
Log.e(TAG, "error while saving music service queue state", e);
}
}
}).start();
}
public void savePosition() {
new Thread(new Runnable() {

13
app/src/main/java/com/kabouzeid/materialmusic/ui/activities/MusicControllerActivity.java
View file

@ -269,7 +269,6 @@ public class MusicControllerActivity extends AbsFabActivity implements OnMusicRe
if (fromUser) {
getApp().getMusicPlayerRemote().seekTo(progress);
}
currentSongProgress.setText(MusicUtil.getReadableDurationString(progress));
}
@Override
@ -365,8 +364,16 @@ public class MusicControllerActivity extends AbsFabActivity implements OnMusicRe
return;
} catch (Exception e) {
}
progressSlider.setMax(total);
progressSlider.setProgress(currentPosition);
final int finalTotal = total;
final int finalCurrentPosition = currentPosition;
runOnUiThread(new Runnable() {
@Override
public void run() {
progressSlider.setMax(finalTotal);
progressSlider.setProgress(finalCurrentPosition);
currentSongProgress.setText(MusicUtil.getReadableDurationString(finalCurrentPosition));
}
});
}
}
}).start();