From 79b25e9c385c3a1a3af6f88139bbd6aae8d0b178 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Thu, 24 Dec 2015 19:47:53 +0000
Subject: removed Decoder::hasHeadroom function

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@5881 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/General/CMakeLists.txt                | 2 +-
 src/plugins/General/General.pro                   | 4 ++--
 src/plugins/Input/cue/decoder_cue.cpp             | 2 +-
 src/plugins/Input/mad/decodermadfactory.cpp       | 2 +-
 src/plugins/Input/vorbis/decodervorbisfactory.cpp | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/plugins')

diff --git a/src/plugins/General/CMakeLists.txt b/src/plugins/General/CMakeLists.txt
index 3eb64595b..1b02b2d19 100644
--- a/src/plugins/General/CMakeLists.txt
+++ b/src/plugins/General/CMakeLists.txt
@@ -71,7 +71,7 @@ add_subdirectory(converter)
 ENDIF(USE_CONVERTER AND TAGLIB_FOUND)
 
 IF(USE_RGSCAN AND TAGLIB_FOUND)
-add_subdirectory(rgscan)
+#add_subdirectory(rgscan)
 ENDIF(USE_RGSCAN AND TAGLIB_FOUND)
 
 IF(USE_SB)
diff --git a/src/plugins/General/General.pro b/src/plugins/General/General.pro
index 9484a4b3d..c503b9db4 100644
--- a/src/plugins/General/General.pro
+++ b/src/plugins/General/General.pro
@@ -9,8 +9,8 @@ SUBDIRS += statusicon \
            streambrowser \
            trackchange \
            hotkey \
-           copypaste \
-           rgscan
+           copypaste
+#           rgscan
 unix:SUBDIRS += mpris \
                 kdenotify \
                 converter \
diff --git a/src/plugins/Input/cue/decoder_cue.cpp b/src/plugins/Input/cue/decoder_cue.cpp
index ddb308e69..141317fb4 100644
--- a/src/plugins/Input/cue/decoder_cue.cpp
+++ b/src/plugins/Input/cue/decoder_cue.cpp
@@ -99,7 +99,7 @@ bool DecoderCUE::initialize()
     configure(m_decoder->audioParameters().sampleRate(),
               m_decoder->audioParameters().channelMap(),
               m_decoder->audioParameters().format());
-    setReplayGainInfo(m_parser->replayGain(m_track), m_decoder->hasHeadroom());
+    setReplayGainInfo(m_parser->replayGain(m_track));
     length_in_bytes = audioParameters().sampleRate() *
                       audioParameters().channels() *
                       audioParameters().sampleSize() * m_length/1000;
diff --git a/src/plugins/Input/mad/decodermadfactory.cpp b/src/plugins/Input/mad/decodermadfactory.cpp
index 91214f6fb..cc508f221 100644
--- a/src/plugins/Input/mad/decodermadfactory.cpp
+++ b/src/plugins/Input/mad/decodermadfactory.cpp
@@ -117,7 +117,7 @@ Decoder *DecoderMADFactory::create(const QString &url, QIODevice *input)
     if(!url.contains("://")) //local file
     {
         ReplayGainReader rg(url);
-        d->setReplayGainInfo(rg.replayGainInfo(), true);
+        d->setReplayGainInfo(rg.replayGainInfo());
     }
     return d;
 }
diff --git a/src/plugins/Input/vorbis/decodervorbisfactory.cpp b/src/plugins/Input/vorbis/decodervorbisfactory.cpp
index 248e25a06..794850c52 100644
--- a/src/plugins/Input/vorbis/decodervorbisfactory.cpp
+++ b/src/plugins/Input/vorbis/decodervorbisfactory.cpp
@@ -67,7 +67,7 @@ Decoder *DecoderVorbisFactory::create(const QString &url, QIODevice *input)
     if(!url.contains("://")) //local file
     {
         ReplayGainReader rg(url);
-        d->setReplayGainInfo(rg.replayGainInfo(), true);
+        d->setReplayGainInfo(rg.replayGainInfo());
     }
     return d;
 }
-- 
cgit v1.2.3-13-gbd6f