From 5aa70084de774999ddc0b40d8f9e52d4fe15e0a0 Mon Sep 17 00:00:00 2001
From: Christopher Eby <kreed@kreed.org>
Date: Sun, 28 Feb 2010 23:31:35 -0600
Subject: [PATCH] Defer cover shifting work in CoverView

This update the control buttons immediately instead of after a noticable delay
---
 src/org/kreed/vanilla/CoverView.java | 52 +++++++++++++++++++---------
 1 file changed, 35 insertions(+), 17 deletions(-)

diff --git a/src/org/kreed/vanilla/CoverView.java b/src/org/kreed/vanilla/CoverView.java
index ee5fbd91..a9bb90e2 100644
--- a/src/org/kreed/vanilla/CoverView.java
+++ b/src/org/kreed/vanilla/CoverView.java
@@ -251,10 +251,10 @@ public class CoverView extends View {
 		mHandler.sendEmptyMessage(0);
 	}
 
-	private void shiftCover(int delta) throws RemoteException
+	private void shiftCover(int delta)
 	{
 		if (mService == null)
-			throw new RemoteException();
+			return;
 
 		int from = delta > 0 ? 1 : 0;
 		int to = delta > 0 ? 0 : 1;
@@ -267,19 +267,29 @@ public class CoverView extends View {
 		reset();
 		invalidate();
 
-		mService.setCurrentSong(delta);
+		try {
+			mService.setCurrentSong(delta);
+		} catch (RemoteException e) {
+			mService = null;
+		}
 
 		mHandler.sendEmptyMessage(i);
 	}
 
 	public void nextCover() throws RemoteException
 	{
-		shiftCover(1);
+		if (mService == null)
+			throw new RemoteException();
+
+		mHandler.sendMessage(mHandler.obtainMessage(GO, 1, 0));
 	}
 
 	public void previousCover() throws RemoteException
 	{
-		shiftCover(-1);
+		if (mService == null)
+			throw new RemoteException();
+
+		mHandler.sendMessage(mHandler.obtainMessage(GO, -1, 0));
 	}
 
 	public void togglePlayback() throws RemoteException
@@ -287,7 +297,7 @@ public class CoverView extends View {
 		if (mService == null)
 			throw new RemoteException();
 
-		mService.togglePlayback();
+		mHandler.sendMessage(mHandler.obtainMessage(GO, 0, 0));
 	}
 
 	public void reset()
@@ -409,24 +419,32 @@ public class CoverView extends View {
 			scrollTo(mScroller.getCurrX(), mScroller.getCurrY());
 			postInvalidate();
 		} else if (mTentativeCover != -1) {
-			try {
-				shiftCover(mTentativeCover - 1);
-			} catch (RemoteException e) {
-				mService = null;
-			}
+			shiftCover(mTentativeCover - 1);
 			mTentativeCover = -1;
 		}
 	}
 
+	private static final int GO = 10;
+
 	private Handler mHandler = new Handler() {
 		public void handleMessage(Message message) {
 			try {
-				int i = message.what;
-				int delta = i - STORE_SIZE / 2;
-				mSongs[i] = mService.getSong(delta);
-				createBitmap(i);
-				if (delta == 0)
-					reset();
+				switch (message.what) {
+				case GO:
+					if (message.arg1 == 0)
+						mService.togglePlayback();
+					else
+						shiftCover(message.arg1);
+					break;
+				default:
+					int i = message.what;
+					int delta = i - STORE_SIZE / 2;
+					mSongs[i] = mService.getSong(delta);
+					createBitmap(i);
+					if (delta == 0)
+						reset();
+					break;
+				}
 			} catch (RemoteException e) {
 				mService = null;
 			}