some volume api changes

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

1 files changed, 6 insertions, 9 deletions

diff --git a/src/plugins/Output/alsa/outputalsa.h b/src/plugins/Output/alsa/outputalsa.h
index dc1a75dce..50974c629 100644
--- a/src/plugins/Output/alsa/outputalsa.h
+++ b/src/plugins/Output/alsa/outputalsa.h
@@ -31,7 +31,7 @@ extern "C"
 }
 
 #include <qmmp/output.h>
-#include <qmmp/volumecontrol.h>
+#include <qmmp/volume.h>
 
 
 class OutputALSA : public Output
@@ -70,17 +70,14 @@ private:
     bool m_can_pause;
 };
 
-class VolumeControlALSA : public VolumeControl
+class VolumeALSA : public Volume
 {
-    Q_OBJECT
 public:
-    VolumeControlALSA(QObject *parent = 0);
-    ~VolumeControlALSA();
-
-    void setVolume(int left, int right) ;
+    VolumeALSA();
+    ~VolumeALSA();
 
-protected:
-    void volume(int *left, int *right);
+    void setVolume(int channel, int value);
+    int volume(int channel);
 
 private:
     //alsa mixer