From 510f3521926daf50652af28124d5787826f7a57d Mon Sep 17 00:00:00 2001
From: Adrian Ulrich <adrian@blinkenlights.ch>
Date: Wed, 1 May 2013 11:05:05 +0200
Subject: [PATCH] replaygain pre-amp configuration support

---
 res/values/translatable.xml                       |  1 +
 res/xml/preference_replaygain.xml                 | 15 +++++++++++++++
 .../blinkenlights/android/vanilla/PrefKeys.java   |  1 +
 .../android/vanilla/SeekBarPreference.java        |  2 ++
 4 files changed, 19 insertions(+)

diff --git a/res/values/translatable.xml b/res/values/translatable.xml
index abce3e74..f6b25528 100644
--- a/res/values/translatable.xml
+++ b/res/values/translatable.xml
@@ -160,6 +160,7 @@ THE SOFTWARE.
 	<string name="replaygain_track_summary">Play all tracks at equal loudness</string>
 	<string name="replaygain_album_title">Enable album Replay Gain</string>
 	<string name="replaygain_album_summary">Preserve album dynamics</string>
+	<string name="replaygain_bump_title">Replay Gain Pre-amp</string>
 	
 	<string name="notifications">Notifications</string>
 	<string name="notification_mode_title">Notification Mode</string>
diff --git a/res/xml/preference_replaygain.xml b/res/xml/preference_replaygain.xml
index 60ace3c1..f9fbfe03 100644
--- a/res/xml/preference_replaygain.xml
+++ b/res/xml/preference_replaygain.xml
@@ -33,4 +33,19 @@ THE SOFTWARE.
 		android:title="@string/replaygain_album_title"
 		android:summary="@string/replaygain_album_summary"
 		android:defaultValue="false" />
+	<ch.blinkenlights.android.vanilla.SeekBarPreference
+		android:key="replaygain_bump"
+		android:negativeButtonText="@null"
+		android:dialogLayout="@layout/shake_pref"
+		android:title="@string/replaygain_bump_title"
+		android:defaultValue="75" />
+		
+	<EditTextPreference
+		android:enabled="false"
+		android:title="Note"
+		android:summary="Android does not allow Vanilla Music to raise the volume 
+to >100%. Setting the Pre-amp to a high value may cause issues if you are listening to 'quiet' music.
+\nRecommended values are:\n-> -3dB for silent/classical music\n-> +3dB for post-2000 recordings"
+		/>
+		
 </PreferenceScreen>
diff --git a/src/ch/blinkenlights/android/vanilla/PrefKeys.java b/src/ch/blinkenlights/android/vanilla/PrefKeys.java
index 24230a67..63bda55b 100644
--- a/src/ch/blinkenlights/android/vanilla/PrefKeys.java
+++ b/src/ch/blinkenlights/android/vanilla/PrefKeys.java
@@ -59,4 +59,5 @@ public class PrefKeys {
 	public static final String VISIBLE_EXTRA_INFO = "visible_extra_info";
 	public static final String ENABLE_TRACK_REPLAYGAIN = "enable_track_replaygain";
 	public static final String ENABLE_ALBUM_REPLAYGAIN = "enable_album_replaygain";
+	public static final String REPLAYGAIN_BUMP = "replaygain_bump";
 }
diff --git a/src/ch/blinkenlights/android/vanilla/SeekBarPreference.java b/src/ch/blinkenlights/android/vanilla/SeekBarPreference.java
index ddb9ea73..5cdbb92f 100644
--- a/src/ch/blinkenlights/android/vanilla/SeekBarPreference.java
+++ b/src/ch/blinkenlights/android/vanilla/SeekBarPreference.java
@@ -76,6 +76,8 @@ public class SeekBarPreference extends DialogPreference implements SeekBar.OnSee
 	{
 		if ("shake_threshold".equals(getKey())) {
 			return String.valueOf(value / 10.0f);
+		} else if("replaygain_bump".equals(getKey())) {
+			return String.format("%+.1fdB", 2*(value-75)/10.0);
 		} else {
 			return String.format("%d%% (%+.1fdB)", value, 20 * Math.log10(Math.pow(value / 100.0, 3)));
 		}