From 5a08592a927c0c3e1e161e8488efb8f751417124 Mon Sep 17 00:00:00 2001
From: Christopher Eby <kreed@kreed.org>
Date: Sat, 10 Apr 2010 15:36:55 -0500
Subject: [PATCH] Move broadcastSongChange into updateState

---
 src/org/kreed/vanilla/PlaybackService.java | 39 +++++++++-------------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/src/org/kreed/vanilla/PlaybackService.java b/src/org/kreed/vanilla/PlaybackService.java
index c39c879b..566dbd86 100644
--- a/src/org/kreed/vanilla/PlaybackService.java
+++ b/src/org/kreed/vanilla/PlaybackService.java
@@ -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);