diff options
| author | James Brown | 2002-10-28 12:56:42 +0000 |
|---|---|---|
| committer | James Brown | 2002-10-28 12:56:42 +0000 |
| commit | 63ee97b1ee6af5db94603b4971329c8f34346f39 (patch) | |
| tree | 166de04aed932a3e7000d39db86aea782e27a12c /scumm/sound.h | |
| parent | 0e0701ade40f3e61a4e4d7a2bc2db4f62e709819 (diff) | |
| download | scummvm-rg350-63ee97b1ee6af5db94603b4971329c8f34346f39.tar.gz scummvm-rg350-63ee97b1ee6af5db94603b4971329c8f34346f39.tar.bz2 scummvm-rg350-63ee97b1ee6af5db94603b4971329c8f34346f39.zip | |
Fix using MAD -without- Vorbis, and remove COMPRESSED_SOUND_FILE define.
Please keep in mind that if you put an 'else' statement in an if clause, keep in mind that if the code it's supposed to
'else' is in another define.... and that isn't set... the NEXT statement of code will be used as the 'if..else'
condition.
svn-id: r5344
Diffstat (limited to 'scumm/sound.h')
| -rw-r--r-- | scumm/sound.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/scumm/sound.h b/scumm/sound.h index 503d5a5872..d382a10a91 100644 --- a/scumm/sound.h +++ b/scumm/sound.h @@ -65,7 +65,6 @@ enum { uint16 _mouthSyncTimes[52]; uint _curSoundPos; -#ifdef COMPRESSED_SOUND_FILE MP3OffsetTable *offset_table; // SO3 MP3 compressed audio int num_sound_effects; // SO3 MP3 compressed audio bool _vorbis_mode; // true if using SOG, false if using SO3 @@ -122,18 +121,12 @@ enum { }; #endif -#endif - Scumm * _scumm; public: -#ifdef COMPRESSED_SOUND_FILE - int _current_cache; -#endif - int _talkChannel; /* Mixer channel actor is talking on */ int _cd_timer_value; bool _soundsPaused; @@ -184,13 +177,11 @@ public: void updateCD(); protected: -#ifdef COMPRESSED_SOUND_FILE int getCachedTrack(int track); int playMP3CDTrack(int track, int num_loops, int start, int delay); int stopMP3CD(); int pollMP3CD(); int updateMP3CD(); -#endif }; #endif |