diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2014-10-06 07:50:56 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2014-10-06 07:50:56 +0000 |
| commit | 76f436c36cdec74e73c12cea8d81051a7d75ec96 (patch) | |
| tree | 03fe155b5311f6dccbf0dfb2a9cb0954484a138c /src/plugins/Output/alsa/outputalsa.h | |
| parent | 67e825df80708f31daf7a4f4cd6045ecf010efa6 (diff) | |
| download | qmmp-76f436c36cdec74e73c12cea8d81051a7d75ec96.tar.gz qmmp-76f436c36cdec74e73c12cea8d81051a7d75ec96.tar.bz2 qmmp-76f436c36cdec74e73c12cea8d81051a7d75ec96.zip | |
added multichannel support
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4530 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Output/alsa/outputalsa.h')
| -rw-r--r-- | src/plugins/Output/alsa/outputalsa.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/Output/alsa/outputalsa.h b/src/plugins/Output/alsa/outputalsa.h index 1600e3b29..d378b813c 100644 --- a/src/plugins/Output/alsa/outputalsa.h +++ b/src/plugins/Output/alsa/outputalsa.h @@ -18,8 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef OUTPUTALSA_H -#define OUTPUTALSA_H +#ifndef OUTPUTALSA_H +#define OUTPUTALSA_H class OutputALSA; @@ -28,6 +28,7 @@ extern "C" #include <alsa/asoundlib.h> } +#include <QHash> #include <qmmp/output.h> #include <qmmp/volume.h> @@ -38,7 +39,7 @@ public: OutputALSA(); ~OutputALSA(); - bool initialize(quint32, int, Qmmp::AudioFormat format); + bool initialize(quint32, ChannelMap map, Qmmp::AudioFormat format); //output api qint64 latency(); qint64 writeAudio(unsigned char *data, qint64 maxSize); @@ -63,6 +64,8 @@ private: qint64 m_prebuf_size; qint64 m_prebuf_fill; bool m_can_pause; + //channel conversions + QHash <quint16, Qmmp::ChannelPosition> m_alsa_channels; }; class VolumeALSA : public Volume |