diff --git a/ChangeLog b/ChangeLog index f2f0d9dd6..12b556112 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,9 +20,6 @@ drive. 14. If a dynamic playlist has rating 0..5 stars, then include all songs (even those without an explicit rating). -15. Add non-GUI rgReferenceLevel config item to set the reference level for - ReplayGain scanning. e.g. add 'rgReferenceLevel=-16.0" to the "General" - section. 2.3.1 ----- diff --git a/replaygain/main.cpp b/replaygain/main.cpp index 7a49f5227..6188b9fd8 100644 --- a/replaygain/main.cpp +++ b/replaygain/main.cpp @@ -26,7 +26,6 @@ #include #include #include "replaygain.h" -#include "config.h" int main(int argc, char *argv[]) { @@ -40,9 +39,6 @@ int main(int argc, char *argv[]) fileNames.append(QString::fromUtf8(argv[i+1])); } - QCoreApplication::setApplicationName(PACKAGE_NAME); - QCoreApplication::setOrganizationName(ORGANIZATION_NAME); - QCoreApplication app(argc, argv); ReplayGain *rg=new ReplayGain(fileNames); QTimer::singleShot(0, rg, SLOT(scan())); diff --git a/replaygain/trackscanner.cpp b/replaygain/trackscanner.cpp index d9b446292..3a61d8f33 100644 --- a/replaygain/trackscanner.cpp +++ b/replaygain/trackscanner.cpp @@ -29,7 +29,6 @@ #ifdef FFMPEG_FOUND #include "ffmpeginput.h" #endif -#include #define RG_REFERENCE_LEVEL -18.0 @@ -43,16 +42,6 @@ double TrackScanner::clamp(double v) double TrackScanner::reference(double v) { - static double rgReferenceLevel = 1.0; - - if (rgReferenceLevel>0.0) { - QSettings s; - s.beginGroup("General"); - rgReferenceLevel = s.contains("rgReferenceLevel") ? s.value("rgReferenceLevel").toDouble() : RG_REFERENCE_LEVEL; - if (rgReferenceLevel > 0.0 || rgReferenceLevel < -64.0) { - rgReferenceLevel = RG_REFERENCE_LEVEL; - } - } return clamp(RG_REFERENCE_LEVEL-v); }