diff options
| author | Max Horn | 2006-11-13 19:46:52 +0000 |
|---|---|---|
| committer | Max Horn | 2006-11-13 19:46:52 +0000 |
| commit | 1a2853f7e0786e0ae1d072f5ce97391ad5d67978 (patch) | |
| tree | a2e83c8592662cdbba11344d362b1653e3d5583d /engines/scumm/smush/smush_mixer.cpp | |
| parent | 9f74b031828b2a309b8194a0da9fdee85dec0cd7 (diff) | |
| download | scummvm-rg350-1a2853f7e0786e0ae1d072f5ce97391ad5d67978.tar.gz scummvm-rg350-1a2853f7e0786e0ae1d072f5ce97391ad5d67978.tar.bz2 scummvm-rg350-1a2853f7e0786e0ae1d072f5ce97391ad5d67978.zip | |
Patch from bug #1584888 (SMUSH: Too dependent on accurate timers). Watch out for regressions in SMUSH movie playback / syncing
svn-id: r24709
Diffstat (limited to 'engines/scumm/smush/smush_mixer.cpp')
| -rw-r--r-- | engines/scumm/smush/smush_mixer.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/engines/scumm/smush/smush_mixer.cpp b/engines/scumm/smush/smush_mixer.cpp index 9b0f67045f..9e6631a365 100644 --- a/engines/scumm/smush/smush_mixer.cpp +++ b/engines/scumm/smush/smush_mixer.cpp @@ -45,14 +45,12 @@ SmushMixer::SmushMixer(Audio::Mixer *m) : } SmushMixer::~SmushMixer() { - Common::StackLock lock(_mutex); for (int32 i = 0; i < NUM_CHANNELS; i++) { _mixer->stopHandle(_channels[i].handle); } } SmushChannel *SmushMixer::findChannel(int32 track) { - Common::StackLock lock(_mutex); debugC(DEBUG_SMUSH, "SmushMixer::findChannel(%d)", track); for (int32 i = 0; i < NUM_CHANNELS; i++) { if (_channels[i].id == track) @@ -62,7 +60,6 @@ SmushChannel *SmushMixer::findChannel(int32 track) { } void SmushMixer::addChannel(SmushChannel *c) { - Common::StackLock lock(_mutex); int32 track = c->getTrackIdentifier(); int i; @@ -91,7 +88,6 @@ void SmushMixer::addChannel(SmushChannel *c) { } bool SmushMixer::handleFrame() { - Common::StackLock lock(_mutex); debugC(DEBUG_SMUSH, "SmushMixer::handleFrame()"); for (int i = 0; i < NUM_CHANNELS; i++) { if (_channels[i].id != -1) { @@ -136,7 +132,6 @@ bool SmushMixer::handleFrame() { } bool SmushMixer::stop() { - Common::StackLock lock(_mutex); debugC(DEBUG_SMUSH, "SmushMixer::stop()"); for (int i = 0; i < NUM_CHANNELS; i++) { if (_channels[i].id != -1) { @@ -154,7 +149,6 @@ bool SmushMixer::stop() { } bool SmushMixer::flush() { - Common::StackLock lock(_mutex); debugC(DEBUG_SMUSH, "SmushMixer::flush()"); for (int i = 0; i < NUM_CHANNELS; i++) { if (_channels[i].id != -1) { |