aboutsummaryrefslogtreecommitdiff
path: root/subsonic-android
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2012-12-27 22:19:56 -0800
committerScott Jackson <daneren2005@gmail.com>2012-12-27 22:19:56 -0800
commitab37b0cc9a46d6f51978408073510c871b28b170 (patch)
tree99b36ef4bad1c0d7b3b61f36ca7407979ed235f0 /subsonic-android
parentce69ecaf7fff113446ab4aae4e541d6bc63152c2 (diff)
downloaddsub-ab37b0cc9a46d6f51978408073510c871b28b170.tar.gz
dsub-ab37b0cc9a46d6f51978408073510c871b28b170.tar.bz2
dsub-ab37b0cc9a46d6f51978408073510c871b28b170.zip
Fix error with RC mode
Diffstat (limited to 'subsonic-android')
-rw-r--r--subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceImpl.java5
1 files changed, 1 insertions, 4 deletions
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);