From aa2f55ddc6730e8c3afce61efa241d5f1b1e6b34 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Thu, 7 Jan 2010 17:14:44 +0000 Subject: Remove the deprecated FLAC, Vorbis and MP3 factories. svn-id: r47134 --- sound/flac.cpp | 24 ------------------------ sound/flac.h | 23 ----------------------- sound/mp3.cpp | 23 ----------------------- sound/mp3.h | 23 ----------------------- sound/vorbis.cpp | 24 ------------------------ sound/vorbis.h | 23 ----------------------- 6 files changed, 140 deletions(-) (limited to 'sound') diff --git a/sound/flac.cpp b/sound/flac.cpp index d225822889..1c7f03b9d1 100644 --- a/sound/flac.cpp +++ b/sound/flac.cpp @@ -724,30 +724,6 @@ void FlacInputStream::callWrapError(const ::FLAC__SeekableStreamDecoder *decoder #pragma mark --- Flac factory functions --- #pragma mark - - -AudioStream *makeFlacStream( - Common::SeekableReadStream *stream, - bool disposeAfterUse, - uint32 startTime, - uint32 duration, - uint numLoops) { - - SeekableAudioStream *input = new FlacInputStream(stream, disposeAfterUse); - assert(input); - - if (startTime || duration) { - Timestamp start(startTime, 1000), end(startTime + duration, 1000); - - if (!duration) - end = input->getLength(); - - input = new SubSeekableAudioStream(input, start, end); - assert(input); - } - - return makeLoopingAudioStream(input, numLoops); -} - SeekableAudioStream *makeFlacStream( Common::SeekableReadStream *stream, bool disposeAfterUse) { diff --git a/sound/flac.h b/sound/flac.h index 5b8acf1154..7c891d41d8 100644 --- a/sound/flac.h +++ b/sound/flac.h @@ -54,29 +54,6 @@ namespace Audio { class AudioStream; class SeekableAudioStream; -/** - * TODO: This is an deprecated interface, it is only for the transition to - * SeekableAudioStream in the engines. - * - * Create a new AudioStream from the FLAC data in the given stream. - * Allows for looping (which is why we require a SeekableReadStream), - * and specifying only a portion of the data to be played, based - * on time offsets. - * - * @param stream the SeekableReadStream from which to read the FLAC data - * @param disposeAfterUse whether to delete the stream after use - * @param startTime the (optional) time offset in milliseconds from which to start playback - * @param duration the (optional) time in milliseconds specifying how long to play - * @param numLoops how often the data shall be looped (0 = infinite) - * @return a new AudioStream, or NULL, if an error occured - */ -AudioStream *makeFlacStream( - Common::SeekableReadStream *stream, - bool disposeAfterUse, - uint32 startTime, - uint32 duration, - uint numLoops); - /** * Create a new SeekableAudioStream from the FLAC data in the given stream. * Allows for seeking (which is why we require a SeekableReadStream). diff --git a/sound/mp3.cpp b/sound/mp3.cpp index f5b6420c4f..98144621c8 100644 --- a/sound/mp3.cpp +++ b/sound/mp3.cpp @@ -338,29 +338,6 @@ int MP3InputStream::readBuffer(int16 *buffer, const int numSamples) { #pragma mark --- MP3 factory functions --- #pragma mark - -AudioStream *makeMP3Stream( - Common::SeekableReadStream *stream, - bool disposeAfterUse, - uint32 startTime, - uint32 duration, - uint numLoops) { - - SeekableAudioStream *mp3 = new MP3InputStream(stream, disposeAfterUse); - assert(mp3); - - if (startTime || duration) { - Timestamp start(startTime, 1000), end(startTime + duration, 1000); - - if (!duration) - end = mp3->getLength(); - - mp3 = new SubSeekableAudioStream(mp3, start, end); - assert(mp3); - } - - return makeLoopingAudioStream(mp3, numLoops); -} - SeekableAudioStream *makeMP3Stream( Common::SeekableReadStream *stream, bool disposeAfterUse) { diff --git a/sound/mp3.h b/sound/mp3.h index 9eb62e10e7..ca5a65ee00 100644 --- a/sound/mp3.h +++ b/sound/mp3.h @@ -54,29 +54,6 @@ namespace Audio { class AudioStream; class SeekableAudioStream; -/** - * TODO: This is an deprecated interface, it is only for the transition to - * SeekableAudioStream in the engines. - * - * Create a new SeekableAudioStream from the MP3 data in the given stream. - * Allows for looping (which is why we require a SeekableReadStream), - * and specifying only a portion of the data to be played, based - * on time offsets. - * - * @param stream the SeekableReadStream from which to read the MP3 data - * @param disposeAfterUse whether to delete the stream after use - * @param startTime the (optional) time offset in milliseconds from which to start playback - * @param duration the (optional) time in milliseconds specifying how long to play - * @param numLoops how often the data shall be looped (0 = infinite) - * @return a new SeekableAudioStream, or NULL, if an error occured - */ -AudioStream *makeMP3Stream( - Common::SeekableReadStream *stream, - bool disposeAfterUse, - uint32 startTime, - uint32 duration, - uint numLoops); - /** * Create a new SeekableAudioStream from the MP3 data in the given stream. * Allows for seeking (which is why we require a SeekableReadStream). diff --git a/sound/vorbis.cpp b/sound/vorbis.cpp index 54d9042cf8..70201cb23d 100644 --- a/sound/vorbis.cpp +++ b/sound/vorbis.cpp @@ -239,30 +239,6 @@ bool VorbisInputStream::refill() { #pragma mark --- Ogg Vorbis factory functions --- #pragma mark - - -AudioStream *makeVorbisStream( - Common::SeekableReadStream *stream, - bool disposeAfterUse, - uint32 startTime, - uint32 duration, - uint numLoops) { - - SeekableAudioStream *input = new VorbisInputStream(stream, disposeAfterUse); - assert(input); - - if (startTime || duration) { - Timestamp start(startTime, 1000), end(startTime + duration, 1000); - - if (!duration) - end = input->getLength(); - - input = new SubSeekableAudioStream(input, start, end); - assert(input); - } - - return makeLoopingAudioStream(input, numLoops); -} - SeekableAudioStream *makeVorbisStream( Common::SeekableReadStream *stream, bool disposeAfterUse) { diff --git a/sound/vorbis.h b/sound/vorbis.h index e0c6f07b58..9e49eead55 100644 --- a/sound/vorbis.h +++ b/sound/vorbis.h @@ -54,29 +54,6 @@ namespace Audio { class AudioStream; class SeekableAudioStream; -/** - * TODO: This is an deprecated interface, it is only for the transition to - * SeekableAudioStream in the engines. - * - * Create a new AudioStream from the Ogg Vorbis data in the given stream. - * Allows for looping (which is why we require a SeekableReadStream), - * and specifying only a portion of the data to be played, based - * on time offsets. - * - * @param stream the SeekableReadStream from which to read the Ogg Vorbis data - * @param disposeAfterUse whether to delete the stream after use - * @param startTime the (optional) time offset in milliseconds from which to start playback - * @param duration the (optional) time in milliseconds specifying how long to play - * @param numLoops how often the data shall be looped (0 = infinite) - * @return a new SeekableAudioStream, or NULL, if an error occured - */ -AudioStream *makeVorbisStream( - Common::SeekableReadStream *stream, - bool disposeAfterUse, - uint32 startTime, - uint32 duration, - uint numLoops); - /** * Create a new SeekableAudioStream from the Ogg Vorbis data in the given stream. * Allows for seeking (which is why we require a SeekableReadStream). -- cgit v1.2.3