diff options
author | Kari Salminen | 2008-04-15 22:35:30 +0000 |
---|---|---|
committer | Kari Salminen | 2008-04-15 22:35:30 +0000 |
commit | 875ee5c913fb3928ce07fc5ea1d53d50bb9ef1f5 (patch) | |
tree | 3f5abdf0902bdf0a8d5a234733df2a386d96920f /engines/agi/sound.h | |
parent | ade3c38dc1d0622b98be679642bc6b4d228301cf (diff) | |
download | scummvm-rg350-875ee5c913fb3928ce07fc5ea1d53d50bb9ef1f5.tar.gz scummvm-rg350-875ee5c913fb3928ce07fc5ea1d53d50bb9ef1f5.tar.bz2 scummvm-rg350-875ee5c913fb3928ce07fc5ea1d53d50bb9ef1f5.zip |
Cleanup (Remove unneeded functions and rename a struct correctly).
svn-id: r31509
Diffstat (limited to 'engines/agi/sound.h')
-rw-r--r-- | engines/agi/sound.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/agi/sound.h b/engines/agi/sound.h index 21545e2cc7..2f96ce4a6a 100644 --- a/engines/agi/sound.h +++ b/engines/agi/sound.h @@ -331,7 +331,7 @@ struct MidiProgramChangeMapping { }; /** Apple IIGS AGI instrument set information. */ -struct instrumentSetInfo { +struct InstrumentSetInfo { uint byteCount; ///< Length of the whole instrument set in bytes uint instCount; ///< Amount of instrument in the set const char *md5; ///< MD5 hex digest of the whole instrument set @@ -346,7 +346,7 @@ struct IIgsExeInfo { uint agiVer; ///< Apple IIGS AGI version number, not strictly needed uint exeSize; ///< Size of the Apple IIGS AGI executable file in bytes uint instSetStart; ///< Starting offset of the instrument set inside the executable file - const instrumentSetInfo &instSet; ///< Information about the used instrument set + const InstrumentSetInfo &instSet; ///< Information about the used instrument set }; class AgiEngine; @@ -411,8 +411,6 @@ public: bool loadInstruments(); void playMidiSound(); void playSampleSound(); - bool finalizeInstruments(Common::SeekableReadStream &uint8Wave); - Audio::AudioStream *makeIIgsSampleStream(Common::SeekableReadStream &stream, int resnum = -1); 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); |