diff options
| author | Paweł Kołodziejski | 2002-10-08 19:35:39 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2002-10-08 19:35:39 +0000 |
| commit | 63762d48de7d86803595d9fa90532565fee8ed68 (patch) | |
| tree | 9ac79fda6b56707183aadda937924dae9a28c583 /scumm/sound.h | |
| parent | 15675e5652f9204beb60b51a1696c907c4c046c8 (diff) | |
| download | scummvm-rg350-63762d48de7d86803595d9fa90532565fee8ed68.tar.gz scummvm-rg350-63762d48de7d86803595d9fa90532565fee8ed68.tar.bz2 scummvm-rg350-63762d48de7d86803595d9fa90532565fee8ed68.zip | |
synced with local sources (imuse)
svn-id: r5110
Diffstat (limited to 'scumm/sound.h')
| -rw-r--r-- | scumm/sound.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/sound.h b/scumm/sound.h index 5b38e555fb..cad4619376 100644 --- a/scumm/sound.h +++ b/scumm/sound.h @@ -43,7 +43,7 @@ enum { bool _soundsPaused2; bool _soundVolumePreset; - int32 _numberBundleMusic; + char * _nameBundleMusic; int32 _currentSampleBundleMusic; int32 _numberSamplesBundleMusic; int32 _offsetSampleBundleMusic; @@ -51,7 +51,7 @@ enum { byte * _musicBundleBufFinal; byte * _musicBundleBufOutput; bool _pauseBundleMusic; - + int32 _bundleMusicTrack; int _talkChannel; /* Mixer channel actor is talking on */ File *_sfxFile; @@ -118,7 +118,7 @@ public: void stopSfxSound(); bool isSfxFinished(); uint32 decode12BitsSample(byte * src, byte ** dst, uint32 size, bool stereo); - void playBundleMusic(int32 song); + void playBundleMusic(char * song); void pauseBundleMusic(bool state); void bundleMusicHandler(Scumm * scumm); void stopBundleMusic(); |