improved software volume control, removed unused code

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@570 90c681e8-e032-0410-971d-27865f9a5e38

4 files changed, 5 insertions, 15 deletions

diff --git a/src/plugins/Output/alsa/outputalsa.cpp b/src/plugins/Output/alsa/outputalsa.cpp
index 1491c4584..6e277663c 100644
--- a/src/plugins/Output/alsa/outputalsa.cpp
+++ b/src/plugins/Output/alsa/outputalsa.cpp
@@ -37,7 +37,7 @@
 #include <qmmp/statehandler.h>
 #include "outputalsa.h"
 
-OutputALSA::OutputALSA(QObject * parent, bool useVolume)
+OutputALSA::OutputALSA(QObject * parent)
         : Output(parent), m_inited(FALSE), m_pause(FALSE), m_play(FALSE),
         m_userStop(FALSE), m_totalWritten(0), m_currentSeconds(-1),
         m_bps(-1), m_channels(-1), m_precision(-1)
@@ -48,22 +48,12 @@ OutputALSA::OutputALSA(QObject * parent, bool useVolume)
     m_use_mmap = settings.value("ALSA/use_mmap", FALSE).toBool();
     pcm_name = strdup(dev_name.toAscii().data());
     pcm_handle = 0;
-    //alsa mixer
-    /*mixer = 0;
-    if (useVolume)
-    {
-        QString card = settings.value("ALSA/mixer_card","hw:0").toString();
-        QString dev = settings.value("ALSA/mixer_device", "PCM").toString();
-        setupMixer(card, dev);
-    }*/
 }
 
 OutputALSA::~OutputALSA()
 {
     uninitialize();
     free (pcm_name);
-    /*if (mixer)
-        snd_mixer_close(mixer);*/
 }
 
 void OutputALSA::stop()
diff --git a/src/plugins/Output/alsa/outputalsa.h b/src/plugins/Output/alsa/outputalsa.h
index abf7cb1e5..72b4de5a1 100644
--- a/src/plugins/Output/alsa/outputalsa.h
+++ b/src/plugins/Output/alsa/outputalsa.h
@@ -38,7 +38,7 @@ class OutputALSA : public Output
 {
     Q_OBJECT
 public:
-    OutputALSA(QObject * parent = 0, bool useVolume = TRUE);
+    OutputALSA(QObject * parent = 0);
     ~OutputALSA();
 
     bool initialize();
diff --git a/src/plugins/Output/alsa/outputalsafactory.cpp b/src/plugins/Output/alsa/outputalsafactory.cpp
index d9ecce6af..3b90073a5 100644
--- a/src/plugins/Output/alsa/outputalsafactory.cpp
+++ b/src/plugins/Output/alsa/outputalsafactory.cpp
@@ -34,9 +34,9 @@ const OutputProperties OutputALSAFactory::properties() const
     return properties;
 }
 
-Output* OutputALSAFactory::create(QObject* parent, bool volume)
+Output* OutputALSAFactory::create(QObject* parent)
 {
-    return new OutputALSA(parent, volume);
+    return new OutputALSA(parent);
 }
 
 VolumeControl *OutputALSAFactory::createVolumeControl(QObject *parent)
diff --git a/src/plugins/Output/alsa/outputalsafactory.h b/src/plugins/Output/alsa/outputalsafactory.h
index b772248d3..98f35ed4f 100644
--- a/src/plugins/Output/alsa/outputalsafactory.h
+++ b/src/plugins/Output/alsa/outputalsafactory.h
@@ -38,7 +38,7 @@ Q_INTERFACES(OutputFactory);
 
 public:
     const OutputProperties properties() const;
-    Output* create(QObject* parent, bool volume);
+    Output* create(QObject* parent);
     VolumeControl *createVolumeControl(QObject *parent);
     void showSettings(QWidget* parent);
     void showAbout(QWidget *parent);