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

[buddha_ at users.sourceforge.net]

Revision: 31510
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31510&view=rev
Author:   buddha_
Date:     2008-04-15 16:00:34 -0700 (Tue, 15 Apr 2008)

Log Message:
-----------
Make convertWave-function static as it uses no member variables.

Modified Paths:
--------------
    scummvm/trunk/engines/agi/sound.cpp
    scummvm/trunk/engines/agi/sound.h

Modified: scummvm/trunk/engines/agi/sound.cpp
===================================================================
--- scummvm/trunk/engines/agi/sound.cpp	2008-04-15 22:35:30 UTC (rev 31509)
+++ scummvm/trunk/engines/agi/sound.cpp	2008-04-15 23:00:34 UTC (rev 31510)
@@ -111,7 +111,7 @@
 		stream.seek(sampleStartPos);
 		_sample = new int8[_header.sampleSize];
 		if (_sample != NULL)
-			_isValid = _manager.convertWave(stream, _sample, _header.sampleSize);
+			_isValid = SoundMgr::convertWave(stream, _sample, _header.sampleSize);
 	}
 
 	if (!_isValid) // Check for errors
@@ -1065,7 +1065,7 @@
 	Common::SharedPtr<Common::MemoryReadStream> uint8Wave = loadWaveFile(waveFsnode->getPath(), *exeInfo);
 	if (uint8Wave && loadInstrumentHeaders(exeFsnode->getPath(), *exeInfo)) {
 		_gsWave.resize(uint8Wave->size()); // Allocate space for the 8-bit signed version of the SIERRASTANDARD-file
-		return convertWave(*uint8Wave, _gsWave.begin(), uint8Wave->size());
+		return SoundMgr::convertWave(*uint8Wave, _gsWave.begin(), uint8Wave->size());
 	} else // Error loading the wave file or the instrument headers
 		return false;
 }

Modified: scummvm/trunk/engines/agi/sound.h
===================================================================
--- scummvm/trunk/engines/agi/sound.h	2008-04-15 22:35:30 UTC (rev 31509)
+++ scummvm/trunk/engines/agi/sound.h	2008-04-15 23:00:34 UTC (rev 31510)
@@ -413,7 +413,7 @@
 	void playSampleSound();
 	const IIgsExeInfo *getIIgsExeInfo(enum AgiGameID gameid) const;
 	bool loadInstrumentHeaders(const Common::String &exePath, const IIgsExeInfo &exeInfo);
-	bool convertWave(Common::SeekableReadStream &source, int8 *dest, uint length);
+	static bool convertWave(Common::SeekableReadStream &source, int8 *dest, uint length);
 	Common::SharedPtr<Common::MemoryReadStream> loadWaveFile(const Common::String &wavePath, const IIgsExeInfo &exeInfo);
 };
 


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