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.cpp | |
| 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.cpp')
| -rw-r--r-- | engines/agi/sound.cpp | 11 |
1 files changed, 2 insertions, 9 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, |