Mercurial > hg > svcore
diff data/fileio/AudioFileReaderFactory.cpp @ 263:71dfc6ab3b54
* Threaded mp3/ogg file reading. Not activated yet, as it doesn't work
in context (SV needs to know the duration of its main model at the outset)
| author | Chris Cannam |
|---|---|
| date | Thu, 24 May 2007 16:20:22 +0000 |
| parents | 2b40f83e7627 |
| children | e08f486e8d8c |
line wrap: on
line diff
--- a/data/fileio/AudioFileReaderFactory.cpp Thu May 10 12:48:26 2007 +0000 +++ b/data/fileio/AudioFileReaderFactory.cpp Thu May 24 16:20:22 2007 +0000 @@ -73,7 +73,9 @@ MP3FileReader::getSupportedExtensions(extensions); if (extensions.find(ext) != extensions.end()) { reader = new MP3FileReader - (path, true, MP3FileReader::CacheInTemporaryFile); + (path, + MP3FileReader::DecodeAtOnce, + MP3FileReader::CacheInTemporaryFile); } } #endif @@ -84,7 +86,9 @@ OggVorbisFileReader::getSupportedExtensions(extensions); if (extensions.find(ext) != extensions.end()) { reader = new OggVorbisFileReader - (path, true, OggVorbisFileReader::CacheInTemporaryFile); + (path, + OggVorbisFileReader::DecodeAtOnce, + OggVorbisFileReader::CacheInTemporaryFile); } } #endif @@ -119,7 +123,9 @@ #ifdef HAVE_OGGZ #ifdef HAVE_FISHSOUND reader = new OggVorbisFileReader - (path, true, OggVorbisFileReader::CacheInTemporaryFile); + (path, + OggVorbisFileReader::DecodeAtOnce, + OggVorbisFileReader::CacheInTemporaryFile); if (reader->isOK()) return reader; if (reader->getError() != "") { std::cerr << "AudioFileReaderFactory: Ogg file reader error: \"" @@ -134,7 +140,9 @@ #ifdef HAVE_MAD reader = new MP3FileReader - (path, true, MP3FileReader::CacheInTemporaryFile); + (path, + MP3FileReader::DecodeAtOnce, + MP3FileReader::CacheInTemporaryFile); if (reader->isOK()) return reader; if (reader->getError() != "") { std::cerr << "AudioFileReaderFactory: MP3 file reader error: \""