libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-18 07:53:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

AUDIO: Add a DisposeAfterUse parameter to makeXAStream

Browse Source
This commit is contained in:
Matthew Hoops 2011-08-24 09:52:41 -04:00
parent 40fd9ce27c
commit 4e849092d2
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
audio/decoders/xa.cpp
View File

@ -28,7 +28,7 @@ namespace Audio {
class XAStream : public Audio::RewindableAudioStream {
public:
XAStream(Common::SeekableReadStream *stream, int rate);
XAStream(Common::SeekableReadStream *stream, int rate, DisposeAfterUse::Flag disposeAfterUse);
~XAStream();
bool isStereo() const { return false; }
@ -39,6 +39,7 @@ public:
bool rewind();
private:
Common::SeekableReadStream *_stream;
DisposeAfterUse::Flag _disposeAfterUse;
byte _predictor;
double _samples[28];
@ -47,7 +48,8 @@ private:
double _s1, _s2;
};
XAStream::XAStream(Common::SeekableReadStream *stream, int rate) : _stream(stream) {
XAStream::XAStream(Common::SeekableReadStream *stream, int rate, DisposeAfterUse::Flag disposeAfterUse)
: _stream(stream), _disposeAfterUse(disposeAfterUse) {
_samplesRemaining = 0;
_predictor = 0;
_s1 = _s2 = 0.0;
@ -56,7 +58,8 @@ XAStream::XAStream(Common::SeekableReadStream *stream, int rate) : _stream(strea
XAStream::~XAStream() {
delete _stream;
if (_disposeAfterUse == DisposeAfterUse::YES)
delete _stream;
}
static const double s_xaDataTable[5][2] =
@ -140,8 +143,8 @@ bool XAStream::rewind() {
return true;
}
RewindableAudioStream *makeXAStream(Common::SeekableReadStream *stream, int rate) {
return new XAStream(stream, rate);
RewindableAudioStream *makeXAStream(Common::SeekableReadStream *stream, int rate, DisposeAfterUse::Flag disposeAfterUse) {
return new XAStream(stream, rate, disposeAfterUse);
}
} // End of namespace Audio

6
audio/decoders/xa.h
View File

@ -31,6 +31,8 @@
#ifndef AUDIO_DECODERS_XA_H
#define AUDIO_DECODERS_XA_H
#include "common/types.h"
namespace Common {
class SeekableReadStream;
}
@ -45,11 +47,13 @@ class RewindableAudioStream;
*
* @param stream the SeekableReadStream from which to read the XA ADPCM data
* @param rate the sampling rate
* @param disposeAfterUse whether to delete the stream after use.
* @return a new RewindableAudioStream, or NULL, if an error occurred
*/
RewindableAudioStream *makeXAStream(
Common::SeekableReadStream *stream,
int rate);
int rate,
DisposeAfterUse::Flag disposeAfterUse = DisposeAfterUse::YES);
} // End of namespace Audio