diff --git a/src/ch/blinkenlights/android/vanilla/PlaybackService.java b/src/ch/blinkenlights/android/vanilla/PlaybackService.java index 515a5f3a..52c38e97 100644 --- a/src/ch/blinkenlights/android/vanilla/PlaybackService.java +++ b/src/ch/blinkenlights/android/vanilla/PlaybackService.java @@ -709,15 +709,11 @@ public final class PlaybackService extends Service Log.d("VanillaMusic", "Must not create new media player object"); } - vLog("VanillaMusic", "A>> hasNext="+mMediaPlayer.hasNextMediaPlayer()+", ds="+mMediaPlayer.getDataSource()+", class="+mMediaPlayer); - vLog("VanillaMusic", "P>> hasNext="+mPreparedMediaPlayer.hasNextMediaPlayer()+", ds="+mPreparedMediaPlayer.getDataSource()+", class="+mPreparedMediaPlayer); - if(doGapless == true) { try { if(nextSong.path.equals(mPreparedMediaPlayer.getDataSource()) == false) { // Prepared MP has a different data source: We need to re-initalize // it and set it as the next MP for the active media player - vLog("VanillaMusic", "GAPLESS: SETTING "+nextSong.path); mPreparedMediaPlayer.reset(); prepareMediaPlayer(mPreparedMediaPlayer, nextSong.path); mMediaPlayer.setNextMediaPlayer(mPreparedMediaPlayer); @@ -725,30 +721,18 @@ public final class PlaybackService extends Service if(mMediaPlayer.hasNextMediaPlayer() == false) { // We can reuse the prepared MediaPlayer but the current instance lacks // a link to it - vLog("VanillaMusic", "SETTING NEXT MP as in "+mPreparedMediaPlayer.getDataSource()); mMediaPlayer.setNextMediaPlayer(mPreparedMediaPlayer); } } catch (IOException e) { - vLog("VanillaMusic", "triggerGaplessUpdate() failed with exception "+e); mMediaPlayer.setNextMediaPlayer(null); mPreparedMediaPlayer.reset(); } } else { if(mMediaPlayer.hasNextMediaPlayer()) { - Log.v("VanillaMusic", "UNCONFIGURING NEW MEDIA PLAYER"); mMediaPlayer.setNextMediaPlayer(null); // There is no need to cleanup mPreparedMediaPlayer } } - - vLog("VanillaMusic", "A<< hasNext="+mMediaPlayer.hasNextMediaPlayer()+", ds="+mMediaPlayer.getDataSource()+", class="+mMediaPlayer); - vLog("VanillaMusic", "P<< hasNext="+mPreparedMediaPlayer.hasNextMediaPlayer()+", ds="+mPreparedMediaPlayer.getDataSource()+", class="+mPreparedMediaPlayer); - } - - // Helper to quickly enable and disable logging of triggerGaplessUpdate - // FIXME: REMOVE ME - private static void vLog(String name, String text) { - Log.v(name, text); } /**