[Scummvm-cvs-logs] SF.net SVN: scummvm: [25201] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 25201
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25201&view=rev
Author:   lordhoto
Date:     2007-01-26 05:09:48 -0800 (Fri, 26 Jan 2007)

Log Message:
-----------
little parameter reodering.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra.cpp
    scummvm/trunk/engines/kyra/sound.cpp
    scummvm/trunk/engines/kyra/sound.h
    scummvm/trunk/engines/kyra/sound_adlib.cpp

Modified: scummvm/trunk/engines/kyra/kyra.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra.cpp	2007-01-26 13:08:22 UTC (rev 25200)
+++ scummvm/trunk/engines/kyra/kyra.cpp	2007-01-26 13:09:48 UTC (rev 25201)
@@ -151,7 +151,7 @@
 		// later on here should be a usage of MixedSoundDriver
 		_sound = new SoundCD(this, _mixer);
 	} else if (midiDriver == MD_ADLIB && _flags.gameID == GI_KYRA1) {
-		_sound = new SoundAdlibPC(_mixer, this);
+		_sound = new SoundAdlibPC(this, _mixer);
 		assert(_sound);
 	} else {
 		bool native_mt32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"));
@@ -162,7 +162,7 @@
 			driver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE);
 		}
 
-		SoundMidiPC *soundMidiPc = new SoundMidiPC(driver, _mixer, this);
+		SoundMidiPC *soundMidiPc = new SoundMidiPC(this, _mixer, driver);
 		_sound = soundMidiPc;
 		assert(_sound);
 		soundMidiPc->hasNativeMT32(native_mt32);
@@ -175,7 +175,7 @@
 		// are decidedly inferior to the Adlib ones.
 
 		if (midiDriver != MD_ADLIB && ConfMan.getBool("multi_midi")) {
-			SoundAdlibPC *adlib = new SoundAdlibPC(_mixer, this);
+			SoundAdlibPC *adlib = new SoundAdlibPC(this, _mixer);
 			assert(adlib);
 			
 			_sound = new MixedSoundDriver(this, _mixer, soundMidiPc, adlib);

Modified: scummvm/trunk/engines/kyra/sound.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound.cpp	2007-01-26 13:08:22 UTC (rev 25200)
+++ scummvm/trunk/engines/kyra/sound.cpp	2007-01-26 13:09:48 UTC (rev 25201)
@@ -95,7 +95,7 @@
 
 #pragma mark -
 
-SoundMidiPC::SoundMidiPC(MidiDriver *driver, Audio::Mixer *mixer, KyraEngine *engine) : Sound(engine, mixer) {
+SoundMidiPC::SoundMidiPC(KyraEngine *engine, Audio::Mixer *mixer, MidiDriver *driver) : Sound(engine, mixer) {
 	_driver = driver;
 	_passThrough = false;
 	_eventFromMusic = false;

Modified: scummvm/trunk/engines/kyra/sound.h
===================================================================
--- scummvm/trunk/engines/kyra/sound.h	2007-01-26 13:08:22 UTC (rev 25200)
+++ scummvm/trunk/engines/kyra/sound.h	2007-01-26 13:09:48 UTC (rev 25201)
@@ -119,7 +119,7 @@
 
 class SoundAdlibPC : public Sound {
 public:
-	SoundAdlibPC(Audio::Mixer *mixer, KyraEngine *engine);
+	SoundAdlibPC(KyraEngine *engine, Audio::Mixer *mixer);
 	~SoundAdlibPC();
 
 	bool init();
@@ -163,7 +163,7 @@
 
 class SoundMidiPC : public MidiDriver, public Sound {
 public:
-	SoundMidiPC(MidiDriver *driver, Audio::Mixer *mixer, KyraEngine *engine);
+	SoundMidiPC(KyraEngine *engine, Audio::Mixer *mixer, MidiDriver *driver);
 	~SoundMidiPC();
 
 	bool init() { return true; }

Modified: scummvm/trunk/engines/kyra/sound_adlib.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_adlib.cpp	2007-01-26 13:08:22 UTC (rev 25200)
+++ scummvm/trunk/engines/kyra/sound_adlib.cpp	2007-01-26 13:09:48 UTC (rev 25201)
@@ -2206,7 +2206,7 @@
 
 const int SoundAdlibPC::_kyra1NumSoundTriggers = ARRAYSIZE(SoundAdlibPC::_kyra1SoundTriggers);
 
-SoundAdlibPC::SoundAdlibPC(Audio::Mixer *mixer, KyraEngine *engine)
+SoundAdlibPC::SoundAdlibPC(KyraEngine *engine, Audio::Mixer *mixer)
 	: Sound(engine, mixer), _driver(0), _trackEntries(), _soundDataPtr(0) {
 	memset(_trackEntries, 0, sizeof(_trackEntries));
 	_driver = new AdlibDriver(mixer);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.