aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2019-03-10 16:36:15 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2019-03-10 16:36:15 +0000
commitee59d7430e43ecd3e9bd5867875278dcdfc80e70 (patch)
tree7c3cbfc8efbb278c1f65c34029daba331ede461e
parent7c64096fc4c36912a0aabeba1ea141e23e7e1668 (diff)
downloadqmmp-ee59d7430e43ecd3e9bd5867875278dcdfc80e70.tar.gz
qmmp-ee59d7430e43ecd3e9bd5867875278dcdfc80e70.tar.bz2
qmmp-ee59d7430e43ecd3e9bd5867875278dcdfc80e70.zip
removed AbstractEngine::setMuted function
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8753 90c681e8-e032-0410-971d-27865f9a5e38
-rw-r--r--src/qmmp/abstractengine.h5
-rw-r--r--src/qmmp/qmmpaudioengine.cpp6
-rw-r--r--src/qmmp/qmmpaudioengine_p.h2
-rw-r--r--src/qmmp/soundcore.cpp3
4 files changed, 0 insertions, 16 deletions
diff --git a/src/qmmp/abstractengine.h b/src/qmmp/abstractengine.h
index a10270da2..ea51b262b 100644
--- a/src/qmmp/abstractengine.h
+++ b/src/qmmp/abstractengine.h
@@ -72,11 +72,6 @@ public:
*/
virtual void pause() = 0;
/*!
- * Mutes/Restores volume. Subclass should reimplement this function.
- * @param muted - state of volume (\b true - mute, \b false - restore)
- */
- virtual void setMuted(bool muted) = 0;
- /*!
* Creates Engine object.
* @param s InputSource object.
* @param parent Parent object.
diff --git a/src/qmmp/qmmpaudioengine.cpp b/src/qmmp/qmmpaudioengine.cpp
index 07f1e6d3c..be6b92360 100644
--- a/src/qmmp/qmmpaudioengine.cpp
+++ b/src/qmmp/qmmpaudioengine.cpp
@@ -47,7 +47,6 @@ QmmpAudioEngine::QmmpAudioEngine(QObject *parent)
m_sample_size = 0;
m_decoder = nullptr;
m_output = nullptr;
- m_muted = false;
m_replayGain = nullptr;
m_dithering = nullptr;
m_converter = new AudioConverter;
@@ -249,11 +248,6 @@ void QmmpAudioEngine::pause()
}
}
-void QmmpAudioEngine::setMuted(bool muted)
-{
- m_muted = muted;
-}
-
void QmmpAudioEngine::stop()
{
m_user_stop = true;
diff --git a/src/qmmp/qmmpaudioengine_p.h b/src/qmmp/qmmpaudioengine_p.h
index b93f8bb6d..08c5293d8 100644
--- a/src/qmmp/qmmpaudioengine_p.h
+++ b/src/qmmp/qmmpaudioengine_p.h
@@ -57,7 +57,6 @@ public:
void seek(qint64 time) override;
void stop() override;
void pause() override;
- void setMuted(bool muted) override;
void addEffect(EffectFactory *factory);
void removeEffect(EffectFactory *factory);
@@ -96,7 +95,6 @@ private:
QHash <Decoder*, InputSource*> m_inputs;
AudioParameters m_ap;
bool m_next;
- bool m_muted;
QSharedPointer<TrackInfo> m_trackInfo;
static QmmpAudioEngine *m_instance;
ReplayGain *m_replayGain;
diff --git a/src/qmmp/soundcore.cpp b/src/qmmp/soundcore.cpp
index 39d2a5db7..a535b1b71 100644
--- a/src/qmmp/soundcore.cpp
+++ b/src/qmmp/soundcore.cpp
@@ -159,8 +159,6 @@ void SoundCore::setVolume(int L, int R)
void SoundCore::setMuted(bool mute)
{
m_volumeControl->setMuted(mute);
- if(m_engine)
- m_engine->setMuted(mute);
}
void SoundCore::changeVolume(int delta)
@@ -279,7 +277,6 @@ void SoundCore::startNextSource()
{
if((m_engine = AbstractEngine::create(s, this)))
{
- m_engine->setMuted(m_volumeControl->isMuted());
m_engine->play();
m_nextState = NO_ENGINE;
return;