diff options
author | athrxx | 2011-05-20 16:06:14 +0200 |
---|---|---|
committer | athrxx | 2011-05-20 20:28:15 +0200 |
commit | 2d1fa6c3f8bdc635d49978ad48f72619707d6893 (patch) | |
tree | c2d0e1a6fde7dd9fa4f13389887747dea2cf45aa /audio/softsynth/fmtowns_pc98/towns_pc98_driver.h | |
parent | ffc2a93daa8d0dd4fed97427ae7f00e4194b26c4 (diff) | |
download | scummvm-rg350-2d1fa6c3f8bdc635d49978ad48f72619707d6893.tar.gz scummvm-rg350-2d1fa6c3f8bdc635d49978ad48f72619707d6893.tar.bz2 scummvm-rg350-2d1fa6c3f8bdc635d49978ad48f72619707d6893.zip |
FM-TOWNS AUDIO: fix thread lockups and cleanup
- fixed lockup situation in imuse destructor (only concerning the fm-towns driver)
- fixed lockup situation when AudioCDManager functions get called
(in both cases both the main thread and the mixer thread would get locked in different mutex belonging to the other thread)
Diffstat (limited to 'audio/softsynth/fmtowns_pc98/towns_pc98_driver.h')
-rw-r--r-- | audio/softsynth/fmtowns_pc98/towns_pc98_driver.h | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/audio/softsynth/fmtowns_pc98/towns_pc98_driver.h b/audio/softsynth/fmtowns_pc98/towns_pc98_driver.h index 46ee23895b..ff58482227 100644 --- a/audio/softsynth/fmtowns_pc98/towns_pc98_driver.h +++ b/audio/softsynth/fmtowns_pc98/towns_pc98_driver.h @@ -50,33 +50,19 @@ public: void fadeStep(); - void pause() { - _musicPlaying = false; - } - void cont() { - _musicPlaying = true; - } + void pause(); + void cont(); - void timerCallbackB(); + bool looping(); + bool musicPlaying(); + + void setMusicVolume(int volume); + void setSoundEffectVolume(int volume); + +private: void timerCallbackA(); + void timerCallbackB(); - bool looping() { - return _looping == _updateChannelsFlag ? true : false; - } - bool musicPlaying() { - return _musicPlaying; - } - - void setMusicVolume(int volume) { - _musicVolume = volume; - setVolumeIntern(_musicVolume, _sfxVolume); - } - void setSoundEffectVolume(int volume) { - _sfxVolume = volume; - setVolumeIntern(_musicVolume, _sfxVolume); - } - -protected: void startSoundEffect(); void setMusicTempo(uint8 tempo); |