From ab37b0cc9a46d6f51978408073510c871b28b170 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Thu, 27 Dec 2012 22:19:56 -0800 Subject: Fix error with RC mode --- .../src/github/daneren2005/dsub/service/DownloadServiceImpl.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'subsonic-android/src') diff --git a/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceImpl.java b/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceImpl.java index 2a84248d..f353e5b4 100644 --- a/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceImpl.java +++ b/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceImpl.java @@ -95,7 +95,6 @@ public class DownloadServiceImpl extends Service implements DownloadService { private final Scrobbler scrobbler = new Scrobbler(); private final JukeboxService jukeboxService = new JukeboxService(this); private DownloadFile currentPlaying; - private File currentPlayingFile; private DownloadFile currentDownloading; private CancellableTask bufferTask; private PlayerState playerState = IDLE; @@ -824,7 +823,6 @@ public class DownloadServiceImpl extends Service implements DownloadService { // TODO: Start play at curr pos on rebuffer instead of restart try { final File file = downloadFile.isCompleteFileAvailable() ? downloadFile.getCompleteFile() : downloadFile.getPartialFile(); - currentPlayingFile = file; downloadFile.updateModificationDate(); mediaPlayer.setOnCompletionListener(null); mediaPlayer.reset(); @@ -904,7 +902,7 @@ public class DownloadServiceImpl extends Service implements DownloadService { mediaPlayer.setOnErrorListener(new MediaPlayer.OnErrorListener() { public boolean onError(MediaPlayer mediaPlayer, int what, int extra) { - Log.w(TAG, "Error on playing file " + "(" + what + ", " + extra + "): " + currentPlayingFile.getPath()); + Log.w(TAG, "Error on playing file " + "(" + what + ", " + extra + "): " + file.getPath()); reset(); downloadFile.setPlaying(false); doPlay(downloadFile, 0, true); @@ -967,7 +965,6 @@ public class DownloadServiceImpl extends Service implements DownloadService { } private void handleError(Exception x) { - Log.w(TAG, "Media player error with file: " + currentPlayingFile.getPath()); Log.w(TAG, "Media player error: " + x, x); mediaPlayer.reset(); setPlayerState(IDLE); -- cgit v1.2.3