Cleanup (Remove unneeded functions and rename a struct correctly).

svn-id: r31509

2 files changed, 4 insertions, 13 deletions

diff --git a/engines/agi/sound.cpp b/engines/agi/sound.cpp
index 89fdb85557..58cda77ce7 100644
--- a/engines/agi/sound.cpp
+++ b/engines/agi/sound.cpp
@@ -250,12 +250,12 @@ static const MidiProgramChangeMapping progToInstMappingV2 = {
 };
 
 /** Older Apple IIGS AGI instrument set. Used only by Space Quest I (AGI v1.002). */
-static const instrumentSetInfo instSetV1 = {
+static const InstrumentSetInfo instSetV1 = {
 	1192, 26, "7ee16bbc135171ffd6b9120cc7ff1af2", "edd3bf8905d9c238e02832b732fb2e18", progToInstMappingV1
 };
 
 /** Newer Apple IIGS AGI instrument set (AGI v1.003+). Used by all others than Space Quest I. */
-static const instrumentSetInfo instSetV2 = {
+static const InstrumentSetInfo instSetV2 = {
 	1292, 28, "b7d428955bb90721996de1cbca25e768", "c05fb0b0e11deefab58bc68fbd2a3d07", progToInstMappingV2
 };
 
@@ -283,13 +283,6 @@ static uint g_numInstruments = 0;
 static uint32 g_IIgsBufGranMillis = 0;
 static uint32 g_midiMillis = 0; // Time position (In milliseconds) in currently playing MIDI sound
 
-bool SoundMgr::finalizeInstruments(Common::SeekableReadStream &uint8Wave) {
-	for (uint i = 0; i < g_numInstruments; i++)
-		if (!g_instruments[i].finalize(uint8Wave))
-			return false;
-	return true;
-}
-
 static const int16 waveformRamp[WAVEFORM_SIZE] = {
 	0, 8, 16, 24, 32, 40, 48, 56,
 	64, 72, 80, 88, 96, 104, 112, 120,
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);