From dc5025f12a0ccaf7e80a4c3c111d6f08d5625cbb Mon Sep 17 00:00:00 2001
From: Brian Rodgers <online@bkrodgers.com>
Date: Wed, 20 Feb 2013 20:24:16 -0600
Subject: [PATCH] Clean up a few things that didn't work to fix missing lock
 screen controls.

---
 .../androidapp/domain/PlayerState.java        | 28 ++++++-------------
 .../service/DownloadServiceImpl.java          | 14 +++++++++-
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/net/sourceforge/subsonic/androidapp/domain/PlayerState.java b/src/net/sourceforge/subsonic/androidapp/domain/PlayerState.java
index daa34535..c9e87426 100644
--- a/src/net/sourceforge/subsonic/androidapp/domain/PlayerState.java
+++ b/src/net/sourceforge/subsonic/androidapp/domain/PlayerState.java
@@ -18,29 +18,17 @@
  */
 package net.sourceforge.subsonic.androidapp.domain;
 
-import android.media.RemoteControlClient;
-
 /**
  * @author Sindre Mehus
  * @version $Id$
  */
 public enum PlayerState {
-	IDLE(RemoteControlClient.PLAYSTATE_STOPPED),
-    DOWNLOADING(RemoteControlClient.PLAYSTATE_BUFFERING),
-    PREPARING(RemoteControlClient.PLAYSTATE_BUFFERING),
-    PREPARED(RemoteControlClient.PLAYSTATE_STOPPED),
-    STARTED(RemoteControlClient.PLAYSTATE_PLAYING),
-    STOPPED(RemoteControlClient.PLAYSTATE_STOPPED),
-    PAUSED(RemoteControlClient.PLAYSTATE_PAUSED),
-    COMPLETED(RemoteControlClient.PLAYSTATE_STOPPED);
-    
-    private final int mRemoteControlClientPlayState;
-    
-    private PlayerState(int playState) {
-    	mRemoteControlClientPlayState = playState;
-    }
-    
-    public int getRemoteControlClientPlayState() {
-    	return mRemoteControlClientPlayState;
-    }
+    IDLE,
+    DOWNLOADING,
+    PREPARING,
+    PREPARED,
+    STARTED,
+    STOPPED,
+    PAUSED,
+    COMPLETED
 }
diff --git a/src/net/sourceforge/subsonic/androidapp/service/DownloadServiceImpl.java b/src/net/sourceforge/subsonic/androidapp/service/DownloadServiceImpl.java
index 8cdb73c3..a8fb739f 100644
--- a/src/net/sourceforge/subsonic/androidapp/service/DownloadServiceImpl.java
+++ b/src/net/sourceforge/subsonic/androidapp/service/DownloadServiceImpl.java
@@ -760,7 +760,19 @@ public class DownloadServiceImpl extends Service implements DownloadService {
         		RemoteControlHelper.registerRemoteControlClient(audioManager, remoteControlClientCompat);
         	}
 
-        	remoteControlClientCompat.setPlaybackState(playerState.getRemoteControlClientPlayState());
+        	switch (playerState)
+        	{
+        	case STARTED:
+        		remoteControlClientCompat.setPlaybackState(RemoteControlClient.PLAYSTATE_PLAYING);
+        		break;
+        	case PAUSED:
+        		remoteControlClientCompat.setPlaybackState(RemoteControlClient.PLAYSTATE_PAUSED);
+        		break;
+        	case IDLE:
+        	case STOPPED:
+        		remoteControlClientCompat.setPlaybackState(RemoteControlClient.PLAYSTATE_STOPPED);
+        		break;
+        	}	
 
         	remoteControlClientCompat.setTransportControlFlags(
         			RemoteControlClient.FLAG_KEY_MEDIA_PLAY |