diff options
author | Max Horn | 2003-07-28 18:01:56 +0000 |
---|---|---|
committer | Max Horn | 2003-07-28 18:01:56 +0000 |
commit | c6a4a1d37d17a36940e581d3aa7163550a637012 (patch) | |
tree | 149d67b0bae27360daaf338704e858fb770f5b61 | |
parent | 475bc7227725cf002558cd6e4224a110831c29f5 (diff) | |
download | scummvm-rg350-c6a4a1d37d17a36940e581d3aa7163550a637012.tar.gz scummvm-rg350-c6a4a1d37d17a36940e581d3aa7163550a637012.tar.bz2 scummvm-rg350-c6a4a1d37d17a36940e581d3aa7163550a637012.zip |
make wrapped stream work (I can hear some music in CoMI now before it segfaults :-)
svn-id: r9258
-rw-r--r-- | sound/audiostream.cpp | 74 | ||||
-rw-r--r-- | sound/audiostream.h | 28 |
2 files changed, 71 insertions, 31 deletions
diff --git a/sound/audiostream.cpp b/sound/audiostream.cpp index 15ef73ff91..130b4c9817 100644 --- a/sound/audiostream.cpp +++ b/sound/audiostream.cpp @@ -21,6 +21,7 @@ #include "audiostream.h" #include "mixer.h" +#include "common/engine.h" template<bool is16Bit, bool isUnsigned> @@ -39,7 +40,7 @@ static inline int16 readSample(const byte *ptr) { } #pragma mark - -#pragma mark --- WrappedMemoryStream --- +#pragma mark --- LinearMemoryStream --- #pragma mark - @@ -75,17 +76,41 @@ public: #pragma mark - +// Wrapped memory stream, to be used by the ChannelStream class (and possibly others?) +template<bool stereo, bool is16Bit, bool isUnsigned> +class WrappedMemoryStream : public WrappedAudioInputStream { +protected: + byte *_bufferStart; + byte *_bufferEnd; + byte *_pos; + byte *_end; + +public: + WrappedMemoryStream(uint bufferSize); + ~WrappedMemoryStream() { free(_bufferStart); } + int16 read(); + int size() const; + bool isStereo() const { + return stereo; + } + + void append(const byte *data, uint32 len); +}; + + template<bool stereo, bool is16Bit, bool isUnsigned> -WrappedMemoryStream<stereo, is16Bit, isUnsigned>::WrappedMemoryStream(const byte *buffer, uint bufferSize) - : _bufferStart(buffer), _bufferEnd(buffer+bufferSize), _pos(buffer), _end(buffer) { +WrappedMemoryStream<stereo, is16Bit, isUnsigned>::WrappedMemoryStream(uint bufferSize) { if (stereo) // Stereo requires an even sized buffer assert(bufferSize % 2 == 0); + _bufferStart = (byte *)malloc(bufferSize); + _pos = _end = _bufferStart; + _bufferEnd = _bufferStart + bufferSize; } template<bool stereo, bool is16Bit, bool isUnsigned> int16 WrappedMemoryStream<stereo, is16Bit, isUnsigned>::read() { assert(_pos != _end); - int16 val = readSample<is16Bit, isUnsigned>(_ptr); + int16 val = readSample<is16Bit, isUnsigned>(_pos); _pos += (is16Bit ? 2 : 1); // Wrap around? @@ -113,8 +138,8 @@ void WrappedMemoryStream<stereo, is16Bit, isUnsigned>::append(const byte *data, debug(2, "WrappedMemoryStream: buffer overflow (A)"); return; } - memcpy(_end, (byte*)data, size_to_end_of_buffer); - memcpy(_bufferStart, (byte *)data + size_to_end_of_buffer, len); + memcpy(_end, data, size_to_end_of_buffer); + memcpy(_bufferStart, data + size_to_end_of_buffer, len); _end = _bufferStart + len; } else { if ((_end < _pos) && (_end + len >= _pos)) { @@ -133,7 +158,7 @@ void WrappedMemoryStream<stereo, is16Bit, isUnsigned>::append(const byte *data, template<bool stereo> -static AudioInputStream *makeInputStream(const byte *ptr, uint32 len, bool isUnsigned, bool is16Bit) { +static AudioInputStream *makeLinearInputStream(const byte *ptr, uint32 len, bool isUnsigned, bool is16Bit) { if (isUnsigned) { if (is16Bit) return new LinearMemoryStream<stereo, true, true>(ptr, len); @@ -148,9 +173,34 @@ static AudioInputStream *makeInputStream(const byte *ptr, uint32 len, bool isUns } -AudioInputStream *makeInputStream(byte _flags, const byte *ptr, uint32 len) { - if (_flags & SoundMixer::FLAG_STEREO) - return makeInputStream<true>(ptr, len, _flags & SoundMixer::FLAG_UNSIGNED, _flags & SoundMixer::FLAG_16BITS); - else - return makeInputStream<false>(ptr, len, _flags & SoundMixer::FLAG_UNSIGNED, _flags & SoundMixer::FLAG_16BITS); +template<bool stereo> +static WrappedAudioInputStream *makeWrappedInputStream(uint32 len, bool isUnsigned, bool is16Bit) { + if (isUnsigned) { + if (is16Bit) + return new WrappedMemoryStream<stereo, true, true>(len); + else + return new WrappedMemoryStream<stereo, false, true>(len); + } else { + if (is16Bit) + return new WrappedMemoryStream<stereo, true, false>(len); + else + return new WrappedMemoryStream<stereo, false, false>(len); + } +} + + +AudioInputStream *makeLinearInputStream(byte _flags, const byte *ptr, uint32 len) { + if (_flags & SoundMixer::FLAG_STEREO) { + return makeLinearInputStream<true>(ptr, len, _flags & SoundMixer::FLAG_UNSIGNED, _flags & SoundMixer::FLAG_16BITS); + } else { + return makeLinearInputStream<false>(ptr, len, _flags & SoundMixer::FLAG_UNSIGNED, _flags & SoundMixer::FLAG_16BITS); + } +} + +WrappedAudioInputStream *makeWrappedInputStream(byte _flags, uint32 len) { + if (_flags & SoundMixer::FLAG_STEREO) { + return makeWrappedInputStream<true>(len, _flags & SoundMixer::FLAG_UNSIGNED, _flags & SoundMixer::FLAG_16BITS); + } else { + return makeWrappedInputStream<false>(len, _flags & SoundMixer::FLAG_UNSIGNED, _flags & SoundMixer::FLAG_16BITS); + } } diff --git a/sound/audiostream.h b/sound/audiostream.h index 344664e276..fbe2f722de 100644 --- a/sound/audiostream.h +++ b/sound/audiostream.h @@ -36,6 +36,8 @@ */ class AudioInputStream { public: + virtual ~AudioInputStream() {} + virtual int16 read() = 0; virtual int size() const = 0; virtual bool isStereo() const = 0; @@ -43,6 +45,11 @@ public: bool eof() const { return size() <= 0; } }; +class WrappedAudioInputStream : public AudioInputStream { +public: + virtual void append(const byte *data, uint32 len) = 0; +}; + class ZeroInputStream : public AudioInputStream { protected: int _len; @@ -53,24 +60,7 @@ public: bool isStereo() const { return false; } }; -// Wrapped memory stream, to be used by the ChannelStream class (and possibly others?) -template<bool stereo, bool is16Bit, bool isUnsigned> -class WrappedMemoryStream : public AudioInputStream { -protected: - byte *_bufferStart; - byte *_bufferEnd; - byte *_pos; - byte *_end; - -public: - WrappedMemoryStream(const byte *buffer, uint bufferSize); - int16 read(); - int size() const; - - void append(const byte *data, uint32 len); -}; - - -AudioInputStream *makeInputStream(byte _flags, const byte *ptr, uint32 len); +AudioInputStream *makeLinearInputStream(byte _flags, const byte *ptr, uint32 len); +WrappedAudioInputStream *makeWrappedInputStream(byte _flags, uint32 len); #endif |