diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2014-10-06 09:27:24 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2014-10-06 09:27:24 +0000 |
| commit | c079fc76a1ccaf305b155c68757d3d345312e67f (patch) | |
| tree | 2078d148fd130424e2fbdffc869e85925453bd01 /src/plugins/Output/oss4 | |
| parent | bc396c60b77202a84e2d76572bc18b6b53bf7959 (diff) | |
| download | qmmp-c079fc76a1ccaf305b155c68757d3d345312e67f.tar.gz qmmp-c079fc76a1ccaf305b155c68757d3d345312e67f.tar.bz2 qmmp-c079fc76a1ccaf305b155c68757d3d345312e67f.zip | |
fixed most output plugins
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4538 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Output/oss4')
| -rw-r--r-- | src/plugins/Output/oss4/outputoss4.cpp | 7 | ||||
| -rw-r--r-- | src/plugins/Output/oss4/outputoss4.h | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/Output/oss4/outputoss4.cpp b/src/plugins/Output/oss4/outputoss4.cpp index c4093a283..bfb9d26e8 100644 --- a/src/plugins/Output/oss4/outputoss4.cpp +++ b/src/plugins/Output/oss4/outputoss4.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010-2012 by Ilya Kotov * + * Copyright (C) 2010-2014 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -86,7 +86,7 @@ void OutputOSS4::sync() ioctl(m_audio_fd, SNDCTL_DSP_SYNC, 0); } -bool OutputOSS4::initialize(quint32 freq, int chan, Qmmp::AudioFormat format) +bool OutputOSS4::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat format) { m_audio_fd = open(m_audio_device.toAscii(), O_WRONLY); @@ -100,6 +100,7 @@ bool OutputOSS4::initialize(quint32 freq, int chan, Qmmp::AudioFormat format) ioctl(m_audio_fd, SNDCTL_DSP_RESET, 0); int p; + int chan = map.count(); switch (format) { case Qmmp::PCM_S32LE: @@ -134,7 +135,7 @@ bool OutputOSS4::initialize(quint32 freq, int chan, Qmmp::AudioFormat format) ioctl(m_audio_fd, SNDCTL_DSP_RESET, 0); - configure(freq, chan, format); + configure(freq, map, format); if(m_vc) m_vc->restore(); diff --git a/src/plugins/Output/oss4/outputoss4.h b/src/plugins/Output/oss4/outputoss4.h index 5266db71b..9996b6f91 100644 --- a/src/plugins/Output/oss4/outputoss4.h +++ b/src/plugins/Output/oss4/outputoss4.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010-2012 by Ilya Kotov * + * Copyright (C) 2010-2014 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -38,7 +38,7 @@ public: OutputOSS4(); virtual ~OutputOSS4(); - bool initialize(quint32, int, Qmmp::AudioFormat format); + bool initialize(quint32, ChannelMap map, Qmmp::AudioFormat format); int fd(); //output api |