[Scummvm-cvs-logs] SF.net SVN: scummvm: [25919] scummvm/trunk/engines

[fingolfin at users.sourceforge.net]

Revision: 25919
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25919&view=rev
Author:   fingolfin
Date:     2007-03-01 09:22:30 -0800 (Thu, 01 Mar 2007)

Log Message:
-----------
Get rid of the last two usages of File::incRef/decRef

Modified Paths:
--------------
    scummvm/trunk/engines/sword1/music.cpp
    scummvm/trunk/engines/sword2/music.cpp

Modified: scummvm/trunk/engines/sword1/music.cpp
===================================================================
--- scummvm/trunk/engines/sword1/music.cpp	2007-03-01 17:15:26 UTC (rev 25918)
+++ scummvm/trunk/engines/sword1/music.cpp	2007-03-01 17:22:30 UTC (rev 25919)
@@ -46,7 +46,6 @@
 
 	_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(void) {
 	free(_sampleBuf);
-	_sourceFile->decRef();
 }
 
 int WaveAudioStream::readBuffer(int16 *buffer, const int numSamples) {

Modified: scummvm/trunk/engines/sword2/music.cpp
===================================================================
--- scummvm/trunk/engines/sword2/music.cpp	2007-03-01 17:15:26 UTC (rev 25918)
+++ scummvm/trunk/engines/sword2/music.cpp	2007-03-01 17:22:30 UTC (rev 25919)
@@ -165,8 +165,6 @@
 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() {
-	_file->decRef();
 }
 
 int CLUInputStream::readBuffer(int16 *buffer, const int numSamples) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.