aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Output/oss4/outputoss4.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/Output/oss4/outputoss4.cpp')
-rw-r--r--src/plugins/Output/oss4/outputoss4.cpp7
1 files changed, 4 insertions, 3 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();