diff options
Diffstat (limited to 'scumm/sound.h')
| -rw-r--r-- | scumm/sound.h | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/scumm/sound.h b/scumm/sound.h index e1b6c7c64d..263208c304 100644 --- a/scumm/sound.h +++ b/scumm/sound.h @@ -28,7 +28,6 @@ class File; namespace Scumm { -class Bundle; class ScummEngine; struct MP3OffsetTable; @@ -38,28 +37,6 @@ protected: int16 _soundQuePos, _soundQue[0x100]; int16 _soundQue2Pos, _soundQue2[10]; -public: - const char *_nameBundleMusic; - int32 _bundleMusicPosition; - int32 _bundleSongPosInMs; - -protected: - const char *_newNameBundleMusic; - byte _musicDisk; - byte _voiceDisk; - int32 _currentSampleBundleMusic; - int32 _numberSamplesBundleMusic; - int32 _offsetSampleBundleMusic; - int32 _offsetBufBundleMusic; - byte *_musicBundleBufFinal; - byte *_musicBundleBufOutput; - bool _pauseBundleMusic; - PlayingSoundHandle _bundleMusicTrack; - bool _musicBundleToBeChanged; - int32 _bundleMusicSampleBits; - int32 _outputMixerSize; - int32 _bundleSampleChannels; - File *_sfxFile; uint32 _talk_sound_a1, _talk_sound_a2, _talk_sound_b1, _talk_sound_b2; byte _talk_sound_mode; @@ -81,8 +58,6 @@ public: PlayingSoundHandle _talkChannelHandle; // Handle of mixer channel actor is talking on bool _soundsPaused; byte _sfxMode; - - Bundle *_bundle; // FIXME: should be protected but is used by ScummEngine::askForDisk public: Sound(ScummEngine *parent); @@ -105,14 +80,6 @@ public: void setupSound(); void pauseSounds(bool pause); - void playBundleMusic(const char *song); - void pauseBundleMusic(bool state); - void bundleMusicHandler(ScummEngine *scumm); - void stopBundleMusic(); - void playBundleSound(char *sound, PlayingSoundHandle *handle); - - uint32 decode12BitsSample(byte *src, byte **dst, uint32 size, bool stereo); - void startCDTimer(); void stopCDTimer(); |