From 5bcb2dcc6048e4df6898640a0f7a053dc75d8ec9 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Tue, 15 Oct 2013 16:32:06 +0000 Subject: rgscan: added flac/ogg flac support, fixed some bugs git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3787 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/General/rgscan/rgscanner.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/plugins/General/rgscan/rgscanner.cpp') diff --git a/src/plugins/General/rgscan/rgscanner.cpp b/src/plugins/General/rgscan/rgscanner.cpp index fcc9158f2..f40eeb599 100644 --- a/src/plugins/General/rgscan/rgscanner.cpp +++ b/src/plugins/General/rgscan/rgscanner.cpp @@ -77,8 +77,8 @@ bool RGScanner::prepare(const QString &url) delete source; return false; } - qDebug("RGScanner: [%s] selected decoder: %s", - qPrintable(factory->properties().shortName), qPrintable(name)); + qDebug("RGScanner: [%s] selected decoder: %s",qPrintable(name), + qPrintable(factory->properties().shortName)); if(factory->properties().noInput && source->ioDevice()) source->ioDevice()->close(); @@ -195,14 +195,15 @@ void RGScanner::run() } else { + qint64 len = m_decoder->read(char_buf, buf_size*ap.sampleSize()); - if(samples < 0) + if(len < 0) { error = true; break; } - else if(samples == 0) + else if(len == 0) break; samples = len / ap.sampleSize(); -- cgit v1.2.3-13-gbd6f