norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Move broadcastSongChange into updateState

Browse Source
This commit is contained in:
Christopher Eby 2010-04-10 15:36:55 -05:00
parent 2b9b5ee742
commit 5a08592a92
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/org/kreed/vanilla/PlaybackService.java
View File

@ -312,26 +312,6 @@ public class PlaybackService extends Service implements Handler.Callback, MediaP
sendBroadcast(intent);
}
public void broadcastChange(int oldState, int newState, Song song)
{
if (newState != oldState || song != mLastSongBroadcast) {
Intent intent = new Intent(EVENT_CHANGED);
intent.putExtra("state", newState);
intent.putExtra("song", song);
sendBroadcast(intent);
if (mScrobble) {
intent = new Intent("net.jjc1138.android.scrobbler.action.MUSIC_STATUS");
intent.putExtra("playing", (newState & FLAG_PLAYING) != 0);
if (song != null)
intent.putExtra("id", song.id);
sendBroadcast(intent);
}
mLastSongBroadcast = song;
}
}
private boolean setFlag(int flag)
{
synchronized (mStateLock) {
@ -360,12 +340,25 @@ public class PlaybackService extends Service implements Handler.Callback, MediaP
int oldState = mState;
mState = state;
Song lastBroadcast = mLastSongBroadcast;
broadcastChange(oldState, state, song);
if (state != oldState || song != mLastSongBroadcast) {
Intent intent = new Intent(EVENT_CHANGED);
intent.putExtra("state", state);
intent.putExtra("song", song);
sendBroadcast(intent);
if (mScrobble) {
intent = new Intent("net.jjc1138.android.scrobbler.action.MUSIC_STATUS");
intent.putExtra("playing", (state & FLAG_PLAYING) != 0);
if (song != null)
intent.putExtra("id", song.id);
sendBroadcast(intent);
}
if (state != oldState || song != lastBroadcast)
updateNotification(song);
mLastSongBroadcast = song;
}
if ((state & FLAG_NO_MEDIA) != 0 && (oldState & FLAG_NO_MEDIA) == 0) {
ContentResolver resolver = ContextApplication.getContext().getContentResolver();
mMediaObserver = new MediaContentObserver(mHandler);