[Scummvm-cvs-logs] SF.net SVN: scummvm:[47844] scummvm/trunk/sound/decoders
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Wed Feb 3 10:19:16 CET 2010
Revision: 47844
http://scummvm.svn.sourceforge.net/scummvm/?rev=47844&view=rev
Author: lordhoto
Date: 2010-02-03 09:19:16 +0000 (Wed, 03 Feb 2010)
Log Message:
-----------
Rename RawAudioStream to RawStream for consistency.
Modified Paths:
--------------
scummvm/trunk/sound/decoders/raw.cpp
scummvm/trunk/sound/decoders/raw.h
scummvm/trunk/sound/decoders/voc.cpp
Modified: scummvm/trunk/sound/decoders/raw.cpp
===================================================================
--- scummvm/trunk/sound/decoders/raw.cpp 2010-02-03 09:11:55 UTC (rev 47843)
+++ scummvm/trunk/sound/decoders/raw.cpp 2010-02-03 09:19:16 UTC (rev 47844)
@@ -42,7 +42,7 @@
#pragma mark -
-#pragma mark --- RawAudioStream ---
+#pragma mark --- RawStream ---
#pragma mark -
/**
@@ -50,7 +50,7 @@
* It also features playback of multiple blocks from a given stream.
*/
template<bool stereo, bool is16Bit, bool isUnsigned, bool isLE>
-class RawAudioStream : public SeekableAudioStream {
+class RawStream : public SeekableAudioStream {
// Allow backends to override buffer size
#ifdef CUSTOM_AUDIO_BUFFER_SIZE
@@ -69,12 +69,12 @@
int32 _filePos; ///< Current position in stream
int32 _diskLeft; ///< Samples left in stream in current block not yet read to buffer
int32 _bufferLeft; ///< Samples left in buffer in current block
- const DisposeAfterUse::Flag _disposeAfterUse; ///< Indicates whether the stream object should be deleted when this RawAudioStream is destructed
+ const DisposeAfterUse::Flag _disposeAfterUse; ///< Indicates whether the stream object should be deleted when this RawStream is destructed
const RawStreamBlockList _blocks; ///< Audio block list
RawStreamBlockList::const_iterator _curBlock; ///< Current audio block number
public:
- RawAudioStream(int rate, DisposeAfterUse::Flag disposeStream, Common::SeekableReadStream *stream, const RawStreamBlockList &blocks)
+ RawStream(int rate, DisposeAfterUse::Flag disposeStream, Common::SeekableReadStream *stream, const RawStreamBlockList &blocks)
: _rate(rate), _playtime(0, rate), _stream(stream), _disposeAfterUse(disposeStream), _blocks(blocks), _curBlock(_blocks.begin()) {
assert(_blocks.size() > 0);
@@ -103,7 +103,7 @@
}
- virtual ~RawAudioStream() {
+ virtual ~RawStream() {
if (_disposeAfterUse == DisposeAfterUse::YES)
delete _stream;
@@ -122,7 +122,7 @@
};
template<bool stereo, bool is16Bit, bool isUnsigned, bool isLE>
-int RawAudioStream<stereo, is16Bit, isUnsigned, isLE>::readBuffer(int16 *buffer, const int numSamples) {
+int RawStream<stereo, is16Bit, isUnsigned, isLE>::readBuffer(int16 *buffer, const int numSamples) {
int oldPos = _stream->pos();
bool restoreFilePosition = false;
@@ -184,7 +184,7 @@
}
template<bool stereo, bool is16Bit, bool isUnsigned, bool isLE>
-bool RawAudioStream<stereo, is16Bit, isUnsigned, isLE>::seek(const Timestamp &where) {
+bool RawStream<stereo, is16Bit, isUnsigned, isLE>::seek(const Timestamp &where) {
const uint32 seekSample = convertTimeToStreamPos(where, getRate(), isStereo()).totalNumberOfFrames();
uint32 curSample = 0;
@@ -230,11 +230,11 @@
#define MAKE_LINEAR_DISK(STEREO, UNSIGNED) \
if (is16Bit) { \
if (isLE) \
- return new RawAudioStream<STEREO, true, UNSIGNED, true>(rate, disposeAfterUse, stream, blockList); \
+ return new RawStream<STEREO, true, UNSIGNED, true>(rate, disposeAfterUse, stream, blockList); \
else \
- return new RawAudioStream<STEREO, true, UNSIGNED, false>(rate, disposeAfterUse, stream, blockList); \
+ return new RawStream<STEREO, true, UNSIGNED, false>(rate, disposeAfterUse, stream, blockList); \
} else \
- return new RawAudioStream<STEREO, false, UNSIGNED, false>(rate, disposeAfterUse, stream, blockList)
+ return new RawStream<STEREO, false, UNSIGNED, false>(rate, disposeAfterUse, stream, blockList)
SeekableAudioStream *makeRawStream(Common::SeekableReadStream *stream,
const RawStreamBlockList &blockList,
@@ -272,7 +272,7 @@
int rate, byte flags,
DisposeAfterUse::Flag disposeAfterUse) {
RawStreamBlockList blocks;
- RawAudioStreamBlock block;
+ RawStreamBlock block;
block.pos = 0;
const bool isStereo = (flags & Audio::FLAG_STEREO) != 0;
@@ -292,8 +292,8 @@
return makeRawStream(new Common::MemoryReadStream(buffer, size, disposeAfterUse), rate, flags, DisposeAfterUse::YES);
}
-SeekableAudioStream *makeRawDiskStream_OLD(Common::SeekableReadStream *stream, RawAudioStreamBlock *block, int numBlocks,
- int rate, byte flags, DisposeAfterUse::Flag disposeStream) {
+SeekableAudioStream *makeRawDiskStream_OLD(Common::SeekableReadStream *stream, RawStreamBlock *block, int numBlocks,
+ int rate, byte flags, DisposeAfterUse::Flag disposeStream) {
assert(numBlocks > 0);
RawStreamBlockList blocks;
for (int i = 0; i < numBlocks; ++i)
Modified: scummvm/trunk/sound/decoders/raw.h
===================================================================
--- scummvm/trunk/sound/decoders/raw.h 2010-02-03 09:11:55 UTC (rev 47843)
+++ scummvm/trunk/sound/decoders/raw.h 2010-02-03 09:19:16 UTC (rev 47844)
@@ -65,18 +65,18 @@
/**
- * Struct used to define the audio data to be played by a RawAudioStream.
+ * Struct used to define the audio data to be played by a RawStream.
*/
-struct RawAudioStreamBlock {
+struct RawStreamBlock {
int32 pos; ///< Position in stream of the block (in bytes of course!)
int32 len; ///< Length of the block (in sample (pairs))
};
/**
* List containing all blocks of a raw stream.
- * @see RawAudioStreamBlock
+ * @see RawStreamBlock
*/
-typedef Common::List<RawAudioStreamBlock> RawStreamBlockList;
+typedef Common::List<RawStreamBlock> RawStreamBlockList;
/**
* Creates an audio stream, which plays from the given buffer.
@@ -133,8 +133,8 @@
* Creates a audio stream, which plays from given stream.
*
* @param stream Stream to play from
- * @param block Pointer to an RawAudioStreamBlock array
- * @see RawAudioStreamBlock
+ * @param block Pointer to an RawStreamBlock array
+ * @see RawStreamBlock
* @param numBlocks Number of blocks.
* @param rate The rate
* @param flags Flags combination.
@@ -143,7 +143,7 @@
* @return The new SeekableAudioStream (or 0 on failure).
*/
SeekableAudioStream *makeRawDiskStream_OLD(Common::SeekableReadStream *stream,
- RawAudioStreamBlock *block, int numBlocks,
+ RawStreamBlock *block, int numBlocks,
int rate, byte flags,
DisposeAfterUse::Flag disposeStream);
Modified: scummvm/trunk/sound/decoders/voc.cpp
===================================================================
--- scummvm/trunk/sound/decoders/voc.cpp 2010-02-03 09:11:55 UTC (rev 47843)
+++ scummvm/trunk/sound/decoders/voc.cpp 2010-02-03 09:19:16 UTC (rev 47844)
@@ -180,7 +180,7 @@
#ifdef STREAM_AUDIO_FROM_DISK
-int parseVOCFormat(Common::SeekableReadStream& stream, RawDiskStreamAudioBlock* block, int &rate, int &loops, int &begin_loop, int &end_loop) {
+int parseVOCFormat(Common::SeekableReadStream& stream, RawStreamBlock* block, int &rate, int &loops, int &begin_loop, int &end_loop) {
VocFileHeader fileHeader;
int currentBlock = 0;
int size = 0;
@@ -302,7 +302,7 @@
AudioStream *makeVOCDiskStream(Common::SeekableReadStream &stream, byte flags, DisposeAfterUse::Flag takeOwnership) {
const int MAX_AUDIO_BLOCKS = 256;
- RawDiskStreamAudioBlock *block = new RawDiskStreamAudioBlock[MAX_AUDIO_BLOCKS];
+ RawStreamBlock *block = new RawStreamBlock[MAX_AUDIO_BLOCKS];
int rate, loops, begin_loop, end_loop;
int numBlocks = parseVOCFormat(stream, block, rate, loops, begin_loop, end_loop);
@@ -322,7 +322,7 @@
SeekableAudioStream *makeVOCDiskStreamNoLoop(Common::SeekableReadStream &stream, byte flags, DisposeAfterUse::Flag takeOwnership) {
const int MAX_AUDIO_BLOCKS = 256;
- RawDiskStreamAudioBlock *block = new RawDiskStreamAudioBlock[MAX_AUDIO_BLOCKS];
+ RawStreamBlock *block = new RawStreamBlock[MAX_AUDIO_BLOCKS];
int rate, loops, begin_loop, end_loop;
int numBlocks = parseVOCFormat(stream, block, rate, loops, begin_loop, end_loop);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list