Mercurial > hg > svcore
diff data/fileio/MP3FileReader.cpp @ 690:1424aa29ae95
Seems to be a bad idea to use plain DEBUG symbol on OS/X (system wants it)
author | Chris Cannam |
---|---|
date | Tue, 14 Jun 2011 15:26:52 +0100 |
parents | 06f13a3b9e9e |
children | e802e550a1f2 |
line wrap: on
line diff
--- a/data/fileio/MP3FileReader.cpp Tue Jun 14 14:47:59 2011 +0100 +++ b/data/fileio/MP3FileReader.cpp Tue Jun 14 15:26:52 2011 +0100 @@ -177,7 +177,7 @@ id3_tag *tag = id3_file_tag(file); if (!tag) { #ifdef DEBUG_ID3TAG - DEBUG << "MP3FileReader::loadTags: No ID3 tag found" << endl; + SVDEBUG << "MP3FileReader::loadTags: No ID3 tag found" << endl; #endif id3_file_close(file); return; @@ -200,7 +200,7 @@ #else #ifdef DEBUG_ID3TAG - DEBUG << "MP3FileReader::loadTags: ID3 tag support not compiled in" + SVDEBUG << "MP3FileReader::loadTags: ID3 tag support not compiled in" << endl; #endif #endif @@ -215,20 +215,20 @@ id3_frame *frame = id3_tag_findframe(tag, name, 0); if (!frame) { #ifdef DEBUG_ID3TAG - DEBUG << "MP3FileReader::loadTags: No \"" << name << "\" in ID3 tag" << endl; + SVDEBUG << "MP3FileReader::loadTags: No \"" << name << "\" in ID3 tag" << endl; #endif return ""; } if (frame->nfields < 2) { - DEBUG << "MP3FileReader::loadTags: WARNING: Not enough fields (" << frame->nfields << ") for \"" << name << "\" in ID3 tag" << endl; + SVDEBUG << "MP3FileReader::loadTags: WARNING: Not enough fields (" << frame->nfields << ") for \"" << name << "\" in ID3 tag" << endl; return ""; } unsigned int nstrings = id3_field_getnstrings(&frame->fields[1]); if (nstrings == 0) { #ifdef DEBUG_ID3TAG - DEBUG << "MP3FileReader::loadTags: No strings for \"" << name << "\" in ID3 tag" << endl; + SVDEBUG << "MP3FileReader::loadTags: No strings for \"" << name << "\" in ID3 tag" << endl; #endif return ""; } @@ -236,7 +236,7 @@ id3_ucs4_t const *ustr = id3_field_getstrings(&frame->fields[1], 0); if (!ustr) { #ifdef DEBUG_ID3TAG - DEBUG << "MP3FileReader::loadTags: Invalid or absent data for \"" << name << "\" in ID3 tag" << endl; + SVDEBUG << "MP3FileReader::loadTags: Invalid or absent data for \"" << name << "\" in ID3 tag" << endl; #endif return ""; } @@ -251,7 +251,7 @@ free(u8str); #ifdef DEBUG_ID3TAG - DEBUG << "MP3FileReader::loadTags: tag \"" << name << "\" -> \"" + SVDEBUG << "MP3FileReader::loadTags: tag \"" << name << "\" -> \"" << rv << "\"" << endl; #endif @@ -365,7 +365,7 @@ initialiseDecodeCache(); if (m_cacheMode == CacheInTemporaryFile) { -// DEBUG << "MP3FileReader::accept: channel count " << m_channelCount << ", file rate " << m_fileRate << ", about to start serialised section" << endl; +// SVDEBUG << "MP3FileReader::accept: channel count " << m_channelCount << ", file rate " << m_fileRate << ", about to start serialised section" << endl; startSerialised("MP3FileReader::Decode"); } }