[Scummvm-cvs-logs] SF.net SVN: scummvm:[42981] scummvm/branches/gsoc2009-mods
nolange at users.sourceforge.net
nolange at users.sourceforge.net
Sun Aug 2 01:14:28 CEST 2009
Revision: 42981
http://scummvm.svn.sourceforge.net/scummvm/?rev=42981&view=rev
Author: nolange
Date: 2009-08-01 23:14:28 +0000 (Sat, 01 Aug 2009)
Log Message:
-----------
stole formatting for constructors from existing code
Modified Paths:
--------------
scummvm/branches/gsoc2009-mods/engines/scumm/player_v4a.cpp
scummvm/branches/gsoc2009-mods/sound/mods/tfmx.cpp
Modified: scummvm/branches/gsoc2009-mods/engines/scumm/player_v4a.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/engines/scumm/player_v4a.cpp 2009-08-01 23:02:45 UTC (rev 42980)
+++ scummvm/branches/gsoc2009-mods/engines/scumm/player_v4a.cpp 2009-08-01 23:14:28 UTC (rev 42981)
@@ -32,17 +32,17 @@
namespace Scumm {
-Player_V4A::Player_V4A(ScummEngine *scumm, Audio::Mixer *mixer) :
- _vm(scumm),
- _mixer(mixer),
- _tfmxMusic(_mixer->getOutputRate(), true),
- _tfmxSfx(_mixer->getOutputRate(), true),
- _musicHandle(),
- _sfxHandle(),
- _musicId(),
- _sfxSlots(),
- _initState(0),
- _signal(0) {
+Player_V4A::Player_V4A(ScummEngine *scumm, Audio::Mixer *mixer)
+ : _vm(scumm),
+ _mixer(mixer),
+ _tfmxMusic(_mixer->getOutputRate(), true),
+ _tfmxSfx(_mixer->getOutputRate(), true),
+ _musicHandle(),
+ _sfxHandle(),
+ _musicId(),
+ _sfxSlots(),
+ _initState(0),
+ _signal(0) {
assert(scumm);
assert(mixer);
Modified: scummvm/branches/gsoc2009-mods/sound/mods/tfmx.cpp
===================================================================
--- scummvm/branches/gsoc2009-mods/sound/mods/tfmx.cpp 2009-08-01 23:02:45 UTC (rev 42980)
+++ scummvm/branches/gsoc2009-mods/sound/mods/tfmx.cpp 2009-08-01 23:14:28 UTC (rev 42981)
@@ -48,7 +48,12 @@
214, 202, 191, 180 };
Tfmx::Tfmx(int rate, bool stereo)
-: Paula(stereo, rate), _resource(), _resourceSample(), _playerCtx() {
+ : Paula(stereo, rate),
+ _resource(),
+ _resourceSample(),
+ _playerCtx(),
+ _deleteResource(false) {
+
_playerCtx.stopWithLastPattern = false;
for (int i = 0; i < kNumVoices; ++i)
@@ -114,7 +119,7 @@
--channel.macroWait;
}
- Paula::setChannelPeriod(channel.paulaChannel, channel.period);
+ Paula::setChannelPeriod(i, channel.period);
if (channel.macroSfxRun >= 0)
channel.macroSfxRun = 1;
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