aboutsummaryrefslogtreecommitdiff
path: root/audio/decoders/raw.h
diff options
context:
space:
mode:
authorJohannes Schickel2011-11-06 14:19:17 +0100
committerJohannes Schickel2011-11-06 14:19:17 +0100
commit38164ba66acc0cad9b19f879cba73006ca687647 (patch)
tree57e7a6a74c0302f07504dc3c3f518425cbd8a523 /audio/decoders/raw.h
parent408d119a11198ea5d472a84ec44d427bd32326af (diff)
downloadscummvm-rg350-38164ba66acc0cad9b19f879cba73006ca687647.tar.gz
scummvm-rg350-38164ba66acc0cad9b19f879cba73006ca687647.tar.bz2
scummvm-rg350-38164ba66acc0cad9b19f879cba73006ca687647.zip
AUDIO: Simplify RawStream code.
This drops the (unused) ability to play based on a list of input blocks. This was formely only used by the NDS specific VOC streaming code, which has been removed in 9fa9f68789ef51e078cb8631e06bead13cae13f2.
Diffstat (limited to 'audio/decoders/raw.h')
-rw-r--r--audio/decoders/raw.h34
1 files changed, 0 insertions, 34 deletions
diff --git a/audio/decoders/raw.h b/audio/decoders/raw.h
index 9d8884fa04..a06bebee10 100644
--- a/audio/decoders/raw.h
+++ b/audio/decoders/raw.h
@@ -60,21 +60,6 @@ enum RawFlags {
FLAG_STEREO = 1 << 3
};
-
-/**
- * Struct used to define the audio data to be played by a RawStream.
- */
-struct RawStreamBlock {
- int32 pos; ///< Position in stream of the block (in bytes of course!)
- int32 len; ///< Length of the block (in raw samples, not sample pairs!)
-};
-
-/**
- * List containing all blocks of a raw stream.
- * @see RawStreamBlock
- */
-typedef Common::List<RawStreamBlock> RawStreamBlockList;
-
/**
* Creates an audio stream, which plays from the given buffer.
*
@@ -104,25 +89,6 @@ SeekableAudioStream *makeRawStream(Common::SeekableReadStream *stream,
int rate, byte flags,
DisposeAfterUse::Flag disposeAfterUse = DisposeAfterUse::YES);
-/**
- * Creates an audio stream, which plays from the given stream.
- *
- * @param stream Stream object to play from.
- * @param blockList List of blocks to play.
- * @see RawDiskStreamAudioBlock
- * @see RawStreamBlockList
- * @param rate Rate of the sound data.
- * @param flags Audio flags combination.
- * @see RawFlags
- * @param disposeAfterUse Whether to delete the stream after use.
- * @return The new SeekableAudioStream (or 0 on failure).
- */
-SeekableAudioStream *makeRawStream(Common::SeekableReadStream *stream,
- const RawStreamBlockList &blockList,
- int rate,
- byte flags,
- DisposeAfterUse::Flag disposeAfterUse = DisposeAfterUse::YES);
-
} // End of namespace Audio
#endif