diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2012-03-07 20:04:51 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2012-03-07 20:04:51 +0000 |
| commit | 74afcc2d9356fef5dbd25f4e7aaabb021c0bfc29 (patch) | |
| tree | f76222901b123facc552c614bf9d1753e2da0afc /src/plugins/Output/oss4/outputoss4.h | |
| parent | 7559299d77b3c375e9b718f986bc079215bf1d27 (diff) | |
| download | qmmp-74afcc2d9356fef5dbd25f4e7aaabb021c0bfc29.tar.gz qmmp-74afcc2d9356fef5dbd25f4e7aaabb021c0bfc29.tar.bz2 qmmp-74afcc2d9356fef5dbd25f4e7aaabb021c0bfc29.zip | |
some volume api changes
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2673 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Output/oss4/outputoss4.h')
| -rw-r--r-- | src/plugins/Output/oss4/outputoss4.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/Output/oss4/outputoss4.h b/src/plugins/Output/oss4/outputoss4.h index 90c9eb85a..06d4b13e3 100644 --- a/src/plugins/Output/oss4/outputoss4.h +++ b/src/plugins/Output/oss4/outputoss4.h @@ -22,12 +22,12 @@ #define OUTPUTOSS4_H #include <qmmp/output.h> -#include <qmmp/volumecontrol.h> +#include <qmmp/volume.h> #define DEFAULT_DEV "/dev/dsp" #define DEFAULT_MIXER "/dev/mixer" -class VolumeControlOSS4; +class VolumeOSS4; /** @author Ilya Kotov <forkotov@hotmail.ru> @@ -36,7 +36,7 @@ class OutputOSS4 : public Output { Q_OBJECT public: - OutputOSS4(QObject * parent); + OutputOSS4(); virtual ~OutputOSS4(); bool initialize(quint32, int, Qmmp::AudioFormat format); @@ -44,7 +44,7 @@ public: qint64 latency(); static OutputOSS4 *instance(); - static VolumeControlOSS4 *m_vc; + static VolumeOSS4 *m_vc; private: //output api @@ -62,15 +62,15 @@ private: }; -class VolumeControlOSS4 : public VolumeControl +class VolumeOSS4 : public Volume { Q_OBJECT public: - VolumeControlOSS4(QObject *parent); - ~VolumeControlOSS4(); + VolumeOSS4(QObject *parent); + ~VolumeOSS4(); - void setVolume(int left, int right); - void volume(int *left, int *right); + void setVolume(int channel, int value); + int volume(int channel); void restore(); private: |