From 719c85f0ca8ac8a0c35dca5cb9caade00d14e54e Mon Sep 17 00:00:00 2001 From: Kari Salminen Date: Tue, 15 Apr 2008 23:00:34 +0000 Subject: Make convertWave-function static as it uses no member variables. svn-id: r31510 --- engines/agi/sound.cpp | 4 ++-- engines/agi/sound.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'engines/agi') diff --git a/engines/agi/sound.cpp b/engines/agi/sound.cpp index 58cda77ce7..31c722fe59 100644 --- a/engines/agi/sound.cpp +++ b/engines/agi/sound.cpp @@ -111,7 +111,7 @@ IIgsSample::IIgsSample(uint8 *data, uint32 len, int resnum, SoundMgr &manager) : 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 @@ bool SoundMgr::loadInstruments() { Common::SharedPtr 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; } diff --git a/engines/agi/sound.h b/engines/agi/sound.h index 2f96ce4a6a..6ba222780a 100644 --- a/engines/agi/sound.h +++ b/engines/agi/sound.h @@ -413,7 +413,7 @@ public: 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 loadWaveFile(const Common::String &wavePath, const IIgsExeInfo &exeInfo); }; -- cgit v1.2.3