From 4ae2e4eb542bf0b86731b06a32a27271e0844567 Mon Sep 17 00:00:00 2001 From: Adrian Ulrich Date: Mon, 1 Apr 2013 21:51:22 +0200 Subject: [PATCH] adjust volume by 0.5 to avoid silence ;-) --- .../android/vanilla/PlaybackService.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/ch/blinkenlights/android/vanilla/PlaybackService.java b/src/ch/blinkenlights/android/vanilla/PlaybackService.java index e0e4f2c5..354be416 100644 --- a/src/ch/blinkenlights/android/vanilla/PlaybackService.java +++ b/src/ch/blinkenlights/android/vanilla/PlaybackService.java @@ -587,15 +587,17 @@ public final class PlaybackService extends Service } if(adjust == 0 && mReplayGainSilenceEnabled) { - adjust = 0.7f; + adjust = 0.25f; } if(adjust > 0) { - Toast.makeText(this, path+"\n"+" PX "+adjust, Toast.LENGTH_SHORT).show(); - mp.setVolume(adjust, adjust); + adjust = adjust * 1.5f; /* add some slack */ Log.d("VanillaMusic", "adjusting replaygain of "+path+" to "+adjust); + } else { + adjust = 1.0f; /* no RG found -> (re-)set mediaplayer to default volume */ } + mp.setVolume(adjust, adjust); mp.prepare(); } @@ -631,7 +633,7 @@ public final class PlaybackService extends Service * re-creates a newone if needed. */ private void triggerGaplessUpdate() { - Log.d("VanillaMusic", "triggering gapless update"); + // Log.d("VanillaMusic", "triggering gapless update"); if(mMediaPlayerInitialized != true) return; @@ -646,7 +648,7 @@ public final class PlaybackService extends Service mMediaPlayer.setNextMediaPlayer(null); mPreparedMediaPlayer.release(); mPreparedMediaPlayer = null; - Log.d("VanillaMusic", "old prepared player destroyed"); + // Log.d("VanillaMusic", "old prepared player destroyed"); } int fa = finishAction(mState); @@ -659,7 +661,7 @@ public final class PlaybackService extends Service mPreparedMediaPlayer = getNewMediaPlayer(); prepareMediaPlayer(mPreparedMediaPlayer, nextSong.path); mMediaPlayer.setNextMediaPlayer(mPreparedMediaPlayer); - Log.d("VanillaMusic", "New media player prepared as "+mPreparedMediaPlayer+" with path "+nextSong.path); + // Log.d("VanillaMusic", "New media player prepared as "+mPreparedMediaPlayer+" with path "+nextSong.path); } catch (IOException e) { Log.e("VanillaMusic", "IOException", e); }