Mercurial > hg > svcore

changeset 1354:97deefd38060 3.0-integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Further win32 build updates
author Chris Cannam
date Mon, 09 Jan 2017 13:51:39 +0000
parents 2001fe23e449
children 1a7687631136
files data/fileio/CodedAudioFileReader.cpp data/fileio/MP3FileReader.cpp
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/data/fileio/CodedAudioFileReader.cpp	Mon Jan 09 11:53:06 2017 +0000
+++ b/data/fileio/CodedAudioFileReader.cpp	Mon Jan 09 13:51:39 2017 +0000
@@ -136,7 +136,7 @@
     
     if (m_fileRate == 0) {
         SVDEBUG << "CodedAudioFileReader::initialiseDecodeCache: ERROR: File sample rate unknown (bug in subclass implementation?)" << endl;
-        throw FileOperationFailed("(coded file)", "File sample rate unknown (bug in subclass implementation?)");
+        throw FileOperationFailed("(coded file)", "sample rate unknown (bug in subclass implementation?)");
     }
     if (m_sampleRate == 0) {
         m_sampleRate = m_fileRate;
--- a/data/fileio/MP3FileReader.cpp	Mon Jan 09 11:53:06 2017 +0000
+++ b/data/fileio/MP3FileReader.cpp	Mon Jan 09 13:51:39 2017 +0000
@@ -475,6 +475,10 @@
         m_fileRate = pcm->samplerate;
         m_channelCount = channels;
 
+        SVDEBUG << "MP3FileReader::accept: file rate = " << pcm->samplerate
+                << ", channel count = " << channels << ", about to init "
+                << "decode cache" << endl;
+
         initialiseDecodeCache();
 
         if (m_cacheMode == CacheInTemporaryFile) {
@@ -504,6 +508,9 @@
     }
 
     if (!isDecodeCacheInitialised()) {
+        SVDEBUG << "MP3FileReader::accept: fallback case: file rate = " << pcm->samplerate
+                << ", channel count = " << channels << ", about to init "
+                << "decode cache" << endl;
         initialiseDecodeCache();
     }