diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2012-12-07 18:50:56 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2012-12-07 18:50:56 +0000 |
| commit | c128ab5445b227c0da7d536d9a881f02284f52b7 (patch) | |
| tree | 3092f35d4c425ce548f6f8ca4c879d8af46b22e8 | |
| parent | 8bded202c7204ad3f655030078c74c17fd121122 (diff) | |
| download | qmmp-c128ab5445b227c0da7d536d9a881f02284f52b7.tar.gz qmmp-c128ab5445b227c0da7d536d9a881f02284f52b7.tar.bz2 qmmp-c128ab5445b227c0da7d536d9a881f02284f52b7.zip | |
fixed regression
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3035 90c681e8-e032-0410-971d-27865f9a5e38
| -rw-r--r-- | src/qmmp/outputwriter.cpp | 6 | ||||
| -rw-r--r-- | src/qmmp/qmmpaudioengine.cpp | 6 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/qmmp/outputwriter.cpp b/src/qmmp/outputwriter.cpp index 35c9d1d37..ff1a83a7e 100644 --- a/src/qmmp/outputwriter.cpp +++ b/src/qmmp/outputwriter.cpp @@ -87,9 +87,6 @@ OutputWriter::~OutputWriter() bool OutputWriter::initialize(quint32 freq, int chan, Qmmp::AudioFormat format) { m_output = Output::create(); - m_frequency = freq; - m_channels = chan; - m_format = format; if(!m_output) { qWarning("OutputWriter: unable to create output"); @@ -103,6 +100,9 @@ bool OutputWriter::initialize(quint32 freq, int chan, Qmmp::AudioFormat format) m_output = 0; return false; } + m_frequency = m_output->sampleRate(); + m_channels = m_output->channels(); + m_format = m_output->format(); QMap<Qmmp::AudioFormat, QString> formatNames; formatNames.insert(Qmmp::PCM_S8, "s8"); formatNames.insert(Qmmp::PCM_S16LE, "s16le"); diff --git a/src/qmmp/qmmpaudioengine.cpp b/src/qmmp/qmmpaudioengine.cpp index 5c06bdad5..8592067df 100644 --- a/src/qmmp/qmmpaudioengine.cpp +++ b/src/qmmp/qmmpaudioengine.cpp @@ -525,12 +525,6 @@ void QmmpAudioEngine::sendMetaData() OutputWriter *QmmpAudioEngine::createOutput() { OutputWriter *output = new OutputWriter(this); - /*if(!output) - { - qWarning("QmmpAudioEngine: unable to create output"); - StateHandler::instance()->dispatch(Qmmp::FatalError); - return 0; - }*/ if (!output->initialize(m_ap.sampleRate(), m_ap.channels(), m_ap.format()) || output->audioParameters() != m_ap) //TODO add soundconverter { |