diff options
| author | bobo1on1 <bob-nospam-@xbmc.org> | 2011-11-07 17:19:08 +0100 |
|---|---|---|
| committer | bobo1on1 <bob-nospam-@xbmc.org> | 2011-11-07 17:19:08 +0100 |
| commit | 3a2f4ea0d9208a7a7356893c804d546327761e88 (patch) | |
| tree | 5321a9d44c893a5df5c2349b4bf5057298a76829 | |
| parent | 6ea880b27bc18fdbba7c2c0610a05bd81a0f2114 (diff) | |
fixed: make volume amplification use the same dB units as the volume control
| -rw-r--r-- | xbmc/cores/dvdplayer/DVDPlayerAudio.cpp | 2 | ||||
| -rw-r--r-- | xbmc/settings/Settings.h | 2 | ||||
| -rw-r--r-- | xbmc/utils/PCMRemap.cpp | 2 | ||||
| -rw-r--r-- | xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp b/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp index 8015275641..00916ff673 100644 --- a/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp +++ b/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp @@ -904,7 +904,7 @@ string CDVDPlayerAudio::GetPlayerInfo() if (m_synctype == SYNC_RESAMPLE) s << ", rr:" << fixed << setprecision(5) << 1.0 / m_resampleratio; - s << ", att:" << fixed << setprecision(1) << log(GetCurrentAttenuation()) * 10.0f << " dB"; + s << ", att:" << fixed << setprecision(1) << log(GetCurrentAttenuation()) * 20.0f << " dB"; return s.str(); } diff --git a/xbmc/settings/Settings.h b/xbmc/settings/Settings.h index 3d9e97b3a1..1566175092 100644 --- a/xbmc/settings/Settings.h +++ b/xbmc/settings/Settings.h @@ -59,7 +59,7 @@ #define VOLUME_MINIMUM -6000 // -60dB #define VOLUME_MAXIMUM 0 // 0dB #define VOLUME_DRC_MINIMUM 0 // 0dB -#define VOLUME_DRC_MAXIMUM 3000 // 30dB +#define VOLUME_DRC_MAXIMUM 6000 // 60dB #define VIEW_MODE_NORMAL 0 #define VIEW_MODE_ZOOM 1 diff --git a/xbmc/utils/PCMRemap.cpp b/xbmc/utils/PCMRemap.cpp index 7bc4baedf4..ec35f0b77d 100644 --- a/xbmc/utils/PCMRemap.cpp +++ b/xbmc/utils/PCMRemap.cpp @@ -517,7 +517,7 @@ void CPCMRemap::Remap(void *data, void *out, unsigned int samples, long drc) { float gain = 1.0f; if (drc > 0) - gain = pow(10.0f, (float)drc / 1000.0f); + gain = pow(10.0f, (float)drc / 2000.0f); Remap(data, out, samples, gain); } diff --git a/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp b/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp index 9202ea07c7..66eee83ead 100644 --- a/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp +++ b/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp @@ -77,7 +77,7 @@ void CGUIDialogAudioSubtitleSettings::CreateSettings() // create our settings m_volume = g_settings.m_nVolumeLevel * 0.01f; AddSlider(AUDIO_SETTINGS_VOLUME, 13376, &m_volume, VOLUME_MINIMUM * 0.01f, (VOLUME_MAXIMUM - VOLUME_MINIMUM) * 0.0001f, VOLUME_MAXIMUM * 0.01f, FormatDecibel, false); - AddSlider(AUDIO_SETTINGS_VOLUME_AMPLIFICATION, 660, &g_settings.m_currentVideoSettings.m_VolumeAmplification, VOLUME_DRC_MINIMUM * 0.01f, (VOLUME_DRC_MAXIMUM - VOLUME_DRC_MINIMUM) / 3000.0f, VOLUME_DRC_MAXIMUM * 0.01f, FormatDecibel, false); + AddSlider(AUDIO_SETTINGS_VOLUME_AMPLIFICATION, 660, &g_settings.m_currentVideoSettings.m_VolumeAmplification, VOLUME_DRC_MINIMUM * 0.01f, (VOLUME_DRC_MAXIMUM - VOLUME_DRC_MINIMUM) / 6000.0f, VOLUME_DRC_MAXIMUM * 0.01f, FormatDecibel, false); if (g_application.m_pPlayer && g_application.m_pPlayer->IsPassthrough()) { EnableSettings(AUDIO_SETTINGS_VOLUME,false); |