From 5d38771c5da3472093b8ee1e16ed7f5534a8e870 Mon Sep 17 00:00:00 2001
From: Christopher Eby <kreed@kreed.org>
Date: Mon, 1 Mar 2010 21:23:56 -0600
Subject: [PATCH] Delay loaded() call a little

Now called when it should be more reasonable to switch songs
---
 src/org/kreed/vanilla/PlaybackService.java | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/org/kreed/vanilla/PlaybackService.java b/src/org/kreed/vanilla/PlaybackService.java
index 155cd549..6d5d4fe5 100644
--- a/src/org/kreed/vanilla/PlaybackService.java
+++ b/src/org/kreed/vanilla/PlaybackService.java
@@ -363,15 +363,6 @@ public class PlaybackService extends Service implements Runnable, MediaPlayer.On
 			broadcastSongChange(getSong(0));
 		}
 
-		int i = mWatchers.beginBroadcast();
-		while (--i != -1) {
-			try {
-				mWatchers.getBroadcastItem(i).loaded();
-			} catch (RemoteException e) {
-			}
-		}
-		mWatchers.finishBroadcast();
-
 		if (stateLoaded)
 			retrieveSongs();
 
@@ -417,6 +408,15 @@ public class PlaybackService extends Service implements Runnable, MediaPlayer.On
 		if (mPendingSeek != 0)
 			mMediaPlayer.seekTo(mPendingSeek);
 
+		int i = mWatchers.beginBroadcast();
+		while (--i != -1) {
+			try {
+				mWatchers.getBroadcastItem(i).loaded();
+			} catch (RemoteException e) {
+			}
+		}
+		mWatchers.finishBroadcast();
+
 		IntentFilter filter = new IntentFilter();
 		filter.addAction(Intent.ACTION_HEADSET_PLUG);
 		filter.addAction(Intent.ACTION_MEDIA_SCANNER_FINISHED);