Fix for skipping issue

1 files changed, 15 insertions, 1 deletions

diff --git a/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceImpl.java b/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceImpl.java
index 0c4d7930..2a84248d 100644
--- a/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceImpl.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceImpl.java
@@ -95,6 +95,7 @@ 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;
@@ -823,6 +824,7 @@ 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();
@@ -832,7 +834,7 @@ public class DownloadServiceImpl extends Service implements DownloadService {
             setPlayerState(PREPARING);
 			
 			mediaPlayer.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
-				public void onPrepared(MediaPlayer mp) {
+				public void onPrepared(MediaPlayer mediaPlayer) {
 					try {
 						setPlayerState(PREPARED);
 
@@ -900,6 +902,17 @@ 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());
+					reset();
+					downloadFile.setPlaying(false);
+					doPlay(downloadFile, 0, true);
+					downloadFile.setPlaying(true);
+					return true;
+				}
+			});
+			
 			mediaPlayer.prepareAsync();
         } catch (Exception x) {
             handleError(x);
@@ -954,6 +967,7 @@ 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);