aboutsummaryrefslogtreecommitdiff
path: root/sound/decoders/raw.h
diff options
context:
space:
mode:
authorJohannes Schickel2010-01-30 15:16:55 +0000
committerJohannes Schickel2010-01-30 15:16:55 +0000
commit17cebab3549bac2ae57d0550d477c6cafbee70c5 (patch)
treeeeb49d3f6c896ad429ddba0378890a94ab3b90a2 /sound/decoders/raw.h
parentce5f91c785c5e1aae3b3aab2f1075d6f30da7162 (diff)
downloadscummvm-rg350-17cebab3549bac2ae57d0550d477c6cafbee70c5.tar.gz
scummvm-rg350-17cebab3549bac2ae57d0550d477c6cafbee70c5.tar.bz2
scummvm-rg350-17cebab3549bac2ae57d0550d477c6cafbee70c5.zip
Change RawDiskStream to use a Common::List to store its blocks internally.
svn-id: r47712
Diffstat (limited to 'sound/decoders/raw.h')
-rw-r--r--sound/decoders/raw.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/sound/decoders/raw.h b/sound/decoders/raw.h
index f4de982d62..4136c9953e 100644
--- a/sound/decoders/raw.h
+++ b/sound/decoders/raw.h
@@ -29,6 +29,8 @@
#include "common/scummsys.h"
#include "common/types.h"
+#include "common/list.h"
+
namespace Common { class SeekableReadStream; }
@@ -105,11 +107,16 @@ AudioStream *makeRawMemoryStream_OLD(const byte *ptr, uint32 len,
* Struct used to define the audio data to be played by a RawDiskStream.
*/
struct RawDiskStreamAudioBlock {
- int32 pos; ///< Position in stream of the block
- int32 len; ///< Length of the block (in samples)
+ int32 pos; ///< Position in stream of the block (in bytes of course!)
+ int32 len; ///< Length of the block (in samples)
};
/**
+ * List containing all blocks of a raw stream.
+ */
+typedef Common::List<RawDiskStreamAudioBlock> RawStreamBlockList;
+
+/**
* Creates a audio stream, which plays from given stream.
*
* @param stream Stream to play from