aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2012-12-08 10:59:25 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2012-12-08 10:59:25 +0000
commit834a8049c6e193c2b2eaa79b90a9c96459781643 (patch)
treee1e991989624758709cd5a7a213df4a89b55b4b9 /src
parent1125a38e6270b6ddaab5bdf67cb97c504baa96c1 (diff)
downloadqmmp-834a8049c6e193c2b2eaa79b90a9c96459781643.tar.gz
qmmp-834a8049c6e193c2b2eaa79b90a9c96459781643.tar.bz2
qmmp-834a8049c6e193c2b2eaa79b90a9c96459781643.zip
fixed 16-bit converter
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3043 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src')
-rw-r--r--src/plugins/Output/waveout/outputwaveout.cpp2
-rw-r--r--src/qmmp/outputwriter.cpp2
-rw-r--r--src/qmmp/qmmpaudioengine.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/Output/waveout/outputwaveout.cpp b/src/plugins/Output/waveout/outputwaveout.cpp
index 901caebbf..6ff100ebc 100644
--- a/src/plugins/Output/waveout/outputwaveout.cpp
+++ b/src/plugins/Output/waveout/outputwaveout.cpp
@@ -128,7 +128,7 @@ bool OutputWaveOut::initialize(quint32 freq, int chan, Qmmp::AudioFormat format)
waveOutReset (dev);
InitializeCriticalSection (&cs);
- configure(freq, chan, format);
+ configure(freq, chan, Qmmp::PCM_S16LE);
return true;
}
diff --git a/src/qmmp/outputwriter.cpp b/src/qmmp/outputwriter.cpp
index ff1a83a7e..dea7b5023 100644
--- a/src/qmmp/outputwriter.cpp
+++ b/src/qmmp/outputwriter.cpp
@@ -95,7 +95,7 @@ bool OutputWriter::initialize(quint32 freq, int chan, Qmmp::AudioFormat format)
if (!m_output->initialize(freq, chan, format))
{
- qWarning("QmmpAudioEngine: unable to initialize output");
+ qWarning("OutputWriter: unable to initialize output");
delete m_output;
m_output = 0;
return false;
diff --git a/src/qmmp/qmmpaudioengine.cpp b/src/qmmp/qmmpaudioengine.cpp
index 9e41954a9..cb9ed2b58 100644
--- a/src/qmmp/qmmpaudioengine.cpp
+++ b/src/qmmp/qmmpaudioengine.cpp
@@ -527,7 +527,6 @@ OutputWriter *QmmpAudioEngine::createOutput()
OutputWriter *output = new OutputWriter(this);
if (!output->initialize(m_ap.sampleRate(), m_ap.channels(), m_ap.format()))
{
- qWarning("QmmpAudioEngine: unable to initialize output");
delete output;
StateHandler::instance()->dispatch(Qmmp::FatalError);
return 0;
@@ -539,6 +538,7 @@ OutputWriter *QmmpAudioEngine::createOutput()
Effect *effect = new AudioConverter();
effect->configure(m_ap.sampleRate(), m_ap.channels(), m_ap.format());
m_ap = effect->audioParameters();
+ m_effects.append(effect);
qDebug("QmmpAudioEngine: output plugin requires 16 bit, using 16-bit converter");
}
else