From 834a8049c6e193c2b2eaa79b90a9c96459781643 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Sat, 8 Dec 2012 10:59:25 +0000
Subject: fixed 16-bit converter

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3043 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/Output/waveout/outputwaveout.cpp | 2 +-
 src/qmmp/outputwriter.cpp                    | 2 +-
 src/qmmp/qmmpaudioengine.cpp                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

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
-- 
cgit v1.2.3-13-gbd6f