aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2007-03-01 17:22:30 +0000
committerMax Horn2007-03-01 17:22:30 +0000
commit45bf5749280ddf1530d11d19b34b11768eb0dbb6 (patch)
tree3f32eed1b0895feaf2a82ee060eb2467d2d6536e
parentc489be38d6c9a1297ff6feab8981c758887e9708 (diff)
downloadscummvm-rg350-45bf5749280ddf1530d11d19b34b11768eb0dbb6.tar.gz
scummvm-rg350-45bf5749280ddf1530d11d19b34b11768eb0dbb6.tar.bz2
scummvm-rg350-45bf5749280ddf1530d11d19b34b11768eb0dbb6.zip
Get rid of the last two usages of File::incRef/decRef
svn-id: r25919
-rw-r--r--engines/sword1/music.cpp2
-rw-r--r--engines/sword2/music.cpp3
2 files changed, 0 insertions, 5 deletions
diff --git a/engines/sword1/music.cpp b/engines/sword1/music.cpp
index 41ca36e306..610ea1de1b 100644
--- a/engines/sword1/music.cpp
+++ b/engines/sword1/music.cpp
@@ -46,7 +46,6 @@ WaveAudioStream::WaveAudioStream(Common::File *source, uint32 pSize) {
_sourceFile = source;
_sampleBuf = (uint8*)malloc(SMP_BUFSIZE);
- _sourceFile->incRef();
if (_sourceFile->isOpen() && Audio::loadWAVFromStream(*_sourceFile, size, rate, flags)) {
_isStereo = (flags & Audio::Mixer::FLAG_STEREO) != 0;
_rate = rate;
@@ -67,7 +66,6 @@ WaveAudioStream::WaveAudioStream(Common::File *source, uint32 pSize) {
WaveAudioStream::~WaveAudioStream(void) {
free(_sampleBuf);
- _sourceFile->decRef();
}
int WaveAudioStream::readBuffer(int16 *buffer, const int numSamples) {
diff --git a/engines/sword2/music.cpp b/engines/sword2/music.cpp
index dcb1fb9e75..bfa65ba248 100644
--- a/engines/sword2/music.cpp
+++ b/engines/sword2/music.cpp
@@ -165,8 +165,6 @@ static Audio::AudioStream *getAudioStream(SoundFileHandle *fh, const char *base,
CLUInputStream::CLUInputStream(Common::File *file, int size)
: _file(file), _firstTime(true), _bufferEnd(_outbuf + BUFFER_SIZE) {
- _file->incRef();
-
// Determine the end position.
_file_pos = _file->pos();
_end_pos = _file_pos + size;
@@ -176,7 +174,6 @@ CLUInputStream::CLUInputStream(Common::File *file, int size)
}
CLUInputStream::~CLUInputStream() {
- _file->decRef();
}
int CLUInputStream::readBuffer(int16 *buffer, const int numSamples) {