thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename RawAudioStream to RawStream for consistency.

Browse source 
svn-id: r47844
This commit is contained in:
Johannes Schickel 2010-02-03 09:19:16 +00:00
parent 286786b6af
commit e7d5849ac8
3 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

26
sound/decoders/raw.cpp
View file

@ -42,7 +42,7 @@ namespace Audio {
#pragma mark - #pragma mark -
#pragma mark --- RawAudioStream --- #pragma mark --- RawStream ---
#pragma mark - #pragma mark -
/** /**
@ -50,7 +50,7 @@ namespace Audio {
* It also features playback of multiple blocks from a given stream. * It also features playback of multiple blocks from a given stream.
*/ */
template<bool stereo, bool is16Bit, bool isUnsigned, bool isLE> template<bool stereo, bool is16Bit, bool isUnsigned, bool isLE>
class RawAudioStream : public SeekableAudioStream { class RawStream : public SeekableAudioStream {
// Allow backends to override buffer size // Allow backends to override buffer size
#ifdef CUSTOM_AUDIO_BUFFER_SIZE #ifdef CUSTOM_AUDIO_BUFFER_SIZE
@ -69,12 +69,12 @@ protected:
int32 _filePos; ///< Current position in stream int32 _filePos; ///< Current position in stream
int32 _diskLeft; ///< Samples left in stream in current block not yet read to buffer int32 _diskLeft; ///< Samples left in stream in current block not yet read to buffer
int32 _bufferLeft; ///< Samples left in buffer in current block 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 const RawStreamBlockList _blocks; ///< Audio block list
RawStreamBlockList::const_iterator _curBlock; ///< Current audio block number RawStreamBlockList::const_iterator _curBlock; ///< Current audio block number
public: 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()) { : _rate(rate), _playtime(0, rate), _stream(stream), _disposeAfterUse(disposeStream), _blocks(blocks), _curBlock(_blocks.begin()) {
assert(_blocks.size() > 0); assert(_blocks.size() > 0);
@ -103,7 +103,7 @@ public:
} }
virtual ~RawAudioStream() { virtual ~RawStream() {
if (_disposeAfterUse == DisposeAfterUse::YES) if (_disposeAfterUse == DisposeAfterUse::YES)
delete _stream; delete _stream;
@ -122,7 +122,7 @@ public:
}; };
template<bool stereo, bool is16Bit, bool isUnsigned, bool isLE> 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(); int oldPos = _stream->pos();
bool restoreFilePosition = false; bool restoreFilePosition = false;
@ -184,7 +184,7 @@ int RawAudioStream<stereo, is16Bit, isUnsigned, isLE>::readBuffer(int16 *buffer,
} }
template<bool stereo, bool is16Bit, bool isUnsigned, bool isLE> 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(); const uint32 seekSample = convertTimeToStreamPos(where, getRate(), isStereo()).totalNumberOfFrames();
uint32 curSample = 0; uint32 curSample = 0;
@ -230,11 +230,11 @@ bool RawAudioStream<stereo, is16Bit, isUnsigned, isLE>::seek(const Timestamp &wh
#define MAKE_LINEAR_DISK(STEREO, UNSIGNED) \ #define MAKE_LINEAR_DISK(STEREO, UNSIGNED) \
if (is16Bit) { \ if (is16Bit) { \
if (isLE) \ 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 \ else \
return new RawAudioStream<STEREO, true, UNSIGNED, false>(rate, disposeAfterUse, stream, blockList); \ return new RawStream<STEREO, true, UNSIGNED, false>(rate, disposeAfterUse, stream, blockList); \
} else \ } 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, SeekableAudioStream *makeRawStream(Common::SeekableReadStream *stream,
const RawStreamBlockList &blockList, const RawStreamBlockList &blockList,
@ -272,7 +272,7 @@ SeekableAudioStream *makeRawStream(Common::SeekableReadStream *stream,
int rate, byte flags, int rate, byte flags,
DisposeAfterUse::Flag disposeAfterUse) { DisposeAfterUse::Flag disposeAfterUse) {
RawStreamBlockList blocks; RawStreamBlockList blocks;
RawAudioStreamBlock block; RawStreamBlock block;
block.pos = 0; block.pos = 0;
const bool isStereo = (flags & Audio::FLAG_STEREO) != 0; const bool isStereo = (flags & Audio::FLAG_STEREO) != 0;
@ -292,8 +292,8 @@ SeekableAudioStream *makeRawStream(const byte *buffer, uint32 size,
return makeRawStream(new Common::MemoryReadStream(buffer, size, disposeAfterUse), rate, flags, DisposeAfterUse::YES); return makeRawStream(new Common::MemoryReadStream(buffer, size, disposeAfterUse), rate, flags, DisposeAfterUse::YES);
} }
SeekableAudioStream *makeRawDiskStream_OLD(Common::SeekableReadStream *stream, RawAudioStreamBlock *block, int numBlocks, SeekableAudioStream *makeRawDiskStream_OLD(Common::SeekableReadStream *stream, RawStreamBlock *block, int numBlocks,
int rate, byte flags, DisposeAfterUse::Flag disposeStream) { int rate, byte flags, DisposeAfterUse::Flag disposeStream) {
assert(numBlocks > 0); assert(numBlocks > 0);
RawStreamBlockList blocks; RawStreamBlockList blocks;
for (int i = 0; i < numBlocks; ++i) for (int i = 0; i < numBlocks; ++i)

14
sound/decoders/raw.h
View file

@ -65,18 +65,18 @@ enum RawFlags {
/** /**
* 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 pos; ///< Position in stream of the block (in bytes of course!)
int32 len; ///< Length of the block (in sample (pairs)) int32 len; ///< Length of the block (in sample (pairs))
}; };
/** /**
* List containing all blocks of a raw stream. * 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. * Creates an audio stream, which plays from the given buffer.
@ -133,8 +133,8 @@ SeekableAudioStream *makeRawStream(Common::SeekableReadStream *stream,
* Creates a audio stream, which plays from given stream. * Creates a audio stream, which plays from given stream.
* *
* @param stream Stream to play from * @param stream Stream to play from
* @param block Pointer to an RawAudioStreamBlock array * @param block Pointer to an RawStreamBlock array
* @see RawAudioStreamBlock * @see RawStreamBlock
* @param numBlocks Number of blocks. * @param numBlocks Number of blocks.
* @param rate The rate * @param rate The rate
* @param flags Flags combination. * @param flags Flags combination.
@ -143,7 +143,7 @@ SeekableAudioStream *makeRawStream(Common::SeekableReadStream *stream,
* @return The new SeekableAudioStream (or 0 on failure). * @return The new SeekableAudioStream (or 0 on failure).
*/ */
SeekableAudioStream *makeRawDiskStream_OLD(Common::SeekableReadStream *stream, SeekableAudioStream *makeRawDiskStream_OLD(Common::SeekableReadStream *stream,
RawAudioStreamBlock *block, int numBlocks, RawStreamBlock *block, int numBlocks,
int rate, byte flags, int rate, byte flags,
DisposeAfterUse::Flag disposeStream); DisposeAfterUse::Flag disposeStream);

6
sound/decoders/voc.cpp
View file

@ -180,7 +180,7 @@ byte *loadVOCFromStream(Common::ReadStream &stream, int &size, int &rate) {
#ifdef STREAM_AUDIO_FROM_DISK #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; VocFileHeader fileHeader;
int currentBlock = 0; int currentBlock = 0;
int size = 0; int size = 0;
@ -302,7 +302,7 @@ int parseVOCFormat(Common::SeekableReadStream& stream, RawDiskStreamAudioBlock*
AudioStream *makeVOCDiskStream(Common::SeekableReadStream &stream, byte flags, DisposeAfterUse::Flag takeOwnership) { AudioStream *makeVOCDiskStream(Common::SeekableReadStream &stream, byte flags, DisposeAfterUse::Flag takeOwnership) {
const int MAX_AUDIO_BLOCKS = 256; 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 rate, loops, begin_loop, end_loop;
int numBlocks = parseVOCFormat(stream, block, rate, loops, begin_loop, end_loop); int numBlocks = parseVOCFormat(stream, block, rate, loops, begin_loop, end_loop);
@ -322,7 +322,7 @@ AudioStream *makeVOCDiskStream(Common::SeekableReadStream &stream, byte flags, D
SeekableAudioStream *makeVOCDiskStreamNoLoop(Common::SeekableReadStream &stream, byte flags, DisposeAfterUse::Flag takeOwnership) { SeekableAudioStream *makeVOCDiskStreamNoLoop(Common::SeekableReadStream &stream, byte flags, DisposeAfterUse::Flag takeOwnership) {
const int MAX_AUDIO_BLOCKS = 256; 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 rate, loops, begin_loop, end_loop;
int numBlocks = parseVOCFormat(stream, block, rate, loops, begin_loop, end_loop); int numBlocks = parseVOCFormat(stream, block, rate, loops, begin_loop, end_loop);