diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2019-03-10 15:36:33 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2019-03-10 15:36:33 +0000 |
| commit | 72d6728bd31d7744d1cf113bf58a5b3fd7d447fe (patch) | |
| tree | 08ab42aa142020759e6ff81cba99b469c5eb97c6 | |
| parent | 0a963762006ae4fa9fb661d6ba341bdfdcd88571 (diff) | |
| download | qmmp-72d6728bd31d7744d1cf113bf58a5b3fd7d447fe.tar.gz qmmp-72d6728bd31d7744d1cf113bf58a5b3fd7d447fe.tar.bz2 qmmp-72d6728bd31d7744d1cf113bf58a5b3fd7d447fe.zip | |
removed SoftwareVolume::instance()
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8750 90c681e8-e032-0410-971d-27865f9a5e38
| -rw-r--r-- | src/qmmp/volumecontrol.cpp | 10 | ||||
| -rw-r--r-- | src/qmmp/volumecontrol_p.h | 1 |
2 files changed, 0 insertions, 11 deletions
diff --git a/src/qmmp/volumecontrol.cpp b/src/qmmp/volumecontrol.cpp index 27dd59732..b172ed23b 100644 --- a/src/qmmp/volumecontrol.cpp +++ b/src/qmmp/volumecontrol.cpp @@ -175,8 +175,6 @@ void VolumeControl::reload() } } -SoftwareVolume *SoftwareVolume::m_instance = nullptr; - SoftwareVolume::SoftwareVolume() { QSettings settings(Qmmp::configFile(), QSettings::IniFormat); @@ -184,7 +182,6 @@ SoftwareVolume::SoftwareVolume() m_right = settings.value("Volume/right", 80).toInt(); m_scaleLeft = (double)m_left/100.0; m_scaleRight = (double)m_right/100.0; - m_instance = this; } SoftwareVolume::~SoftwareVolume() @@ -192,7 +189,6 @@ SoftwareVolume::~SoftwareVolume() QSettings settings(Qmmp::configFile(), QSettings::IniFormat); settings.setValue("Volume/left", m_left); settings.setValue("Volume/right", m_right); - m_instance = nullptr; } void SoftwareVolume::setVolume(const VolumeSettings &v) @@ -229,9 +225,3 @@ void SoftwareVolume::changeVolume(Buffer *b, int chan) } } } - -//static -SoftwareVolume *SoftwareVolume::instance() -{ - return m_instance; -} diff --git a/src/qmmp/volumecontrol_p.h b/src/qmmp/volumecontrol_p.h index c685cc0d0..2e2678c81 100644 --- a/src/qmmp/volumecontrol_p.h +++ b/src/qmmp/volumecontrol_p.h @@ -142,7 +142,6 @@ public: private: int m_left, m_right; double m_scaleLeft, m_scaleRight; - static SoftwareVolume *m_instance; }; #endif |