libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-12 12:09:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
svn-id: r31510
This commit is contained in:
Kari Salminen 2008-04-15 23:00:34 +00:00
parent 875ee5c913
commit 719c85f0ca
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/agi/sound.cpp
View File

@ -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<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;
}

2
engines/agi/sound.h
View File

@ -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<Common::MemoryReadStream> loadWaveFile(const Common::String &wavePath, const IIgsExeInfo &exeInfo);
};