diff options
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | res/xml/settings.xml | 6 | ||||
| -rw-r--r-- | src/github/daneren2005/dsub/service/DownloadService.java | 2 | ||||
| -rw-r--r-- | src/github/daneren2005/dsub/util/Constants.java | 1 |
4 files changed, 10 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 009e369b..64237ac0 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -429,6 +429,8 @@ <string name="settings.large_album_art_summary">Display albums with large album art instead of in a list</string>
<string name="settings.admin_enabled">Admin Enabled</string>
<string name="settings.admin_enabled_summary">Whether or not to display the admin listing in the pull out drawer</string>
+ <string name="settings.replay_gain">Replay Gain</string>
+ <string name="settings.replay_gain_summary">Whether or not to scale playback volume by track and album replay gain tags</string>
<string name="shuffle.title">Shuffle By</string>
<string name="shuffle.startYear">Start Year:</string>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml index bafb5f6c..bc2fd9e3 100644 --- a/res/xml/settings.xml +++ b/res/xml/settings.xml @@ -370,6 +370,12 @@ android:defaultValue="true"/> <CheckBoxPreference + android:title="@string/settings.replay_gain" + android:summary="@string/settings.replay_gain_summary" + android:key="replayGain" + android:defaultValue="false"/> + + <CheckBoxPreference android:title="@string/settings.gapless_playback" android:summary="@string/settings.gapless_playback_summary" android:key="gaplessPlayback" diff --git a/src/github/daneren2005/dsub/service/DownloadService.java b/src/github/daneren2005/dsub/service/DownloadService.java index 1e32bd2a..9c2e2ce5 100644 --- a/src/github/daneren2005/dsub/service/DownloadService.java +++ b/src/github/daneren2005/dsub/service/DownloadService.java @@ -1940,7 +1940,7 @@ public class DownloadService extends Service { try { float[] rg = BastpUtil.getReplayGainValues(downloadFile.getFile().getCanonicalPath()); /* track, album */ float adjust = 0f; - if (Util.getPreferences(this).getBoolean(Constants.PREFERENCES_KEY_REPLAY_GAIN, true)) { + if (Util.getPreferences(this).getBoolean(Constants.PREFERENCES_KEY_REPLAY_GAIN, false)) { // If playing a single album or no track gain, use album gain if((singleAlbum || rg[0] == 0) && rg[1] != 0) { adjust = rg[1]; diff --git a/src/github/daneren2005/dsub/util/Constants.java b/src/github/daneren2005/dsub/util/Constants.java index a61102fe..88dfa086 100644 --- a/src/github/daneren2005/dsub/util/Constants.java +++ b/src/github/daneren2005/dsub/util/Constants.java @@ -144,6 +144,7 @@ public final class Constants { public static final String PREFERENCES_KEY_SERVER_SYNC = "serverSync"; public static final String PREFERENCES_KEY_RECENT_COUNT = "mostRecentCount"; public static final String PREFERENCES_KEY_MENU_RATING = "showRating"; + public static final String PREFERENCES_KEY_REPLAY_GAIN = "replayGain"; public static final String OFFLINE_SCROBBLE_COUNT = "scrobbleCount"; public static final String OFFLINE_SCROBBLE_ID = "scrobbleID"; |