[Scummvm-cvs-logs] SF.net SVN: scummvm:[41712] scummvm/branches/gsoc2009-mods/engines/scumm/ player_v4a.cpp
nolange at users.sourceforge.net
nolange at users.sourceforge.net
Sat Jun 20 16:15:30 CEST 2009
Revision: 41712
http://scummvm.svn.sourceforge.net/scummvm/?rev=41712&view=rev
Author: nolange
Date: 2009-06-20 14:15:30 +0000 (Sat, 20 Jun 2009)
Log Message:
-----------
inadvertedly used autofreestream which resulted in the Tfmx-Object beeing deleted twice
Modified Paths:
--------------
scummvm/branches/gsoc2009-mods/engines/scumm/player_v4a.cpp
Modified: scummvm/branches/gsoc2009-mods/engines/scumm/player_v4a.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/scumm/player_v4a.cpp 2009-06-20 13:51:35 UTC (rev 41711)
+++ scummvm/branches/gsoc2009-mods/engines/scumm/player_v4a.cpp 2009-06-20 14:15:30 UTC (rev 41712)
@@ -124,7 +124,7 @@
_tfmxSfx->doSfx(index);
if (!_mixer->isSoundHandleActive(_sfxHandle))
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_sfxHandle, _tfmxSfx, -1, Audio::Mixer::kMaxChannelVolume, 0, true, false);
+ _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_sfxHandle, _tfmxSfx, -1, Audio::Mixer::kMaxChannelVolume, 0, false, true);
} else {
// Song
debug(5, "player_v4a: play song %i", index);
@@ -134,7 +134,7 @@
_musicId = nr;
if (!_mixer->isSoundHandleActive(_musicHandle))
- _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_musicHandle, _tfmxPlay, -1, Audio::Mixer::kMaxChannelVolume, 0, true, false);
+ _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_musicHandle, _tfmxPlay, -1, Audio::Mixer::kMaxChannelVolume, 0, false, true);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list