[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.313,2.314 imuse_player.cpp,2.15,2.16 imuse_internal.h,2.11,2.12 imuse.h,1.37,1.38 imuse.cpp,2.71,2.72
Max Horn
fingolfin at users.sourceforge.net
Tue Aug 5 16:59:02 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv27828/scumm
Modified Files:
scummvm.cpp imuse_player.cpp imuse_internal.h imuse.h
imuse.cpp
Log Message:
getting rid of g_mixer; removing lots of whitespace
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.313
retrieving revision 2.314
diff -u -d -r2.313 -r2.314
--- scummvm.cpp 5 Aug 2003 17:50:06 -0000 2.313
+++ scummvm.cpp 5 Aug 2003 23:58:23 -0000 2.314
@@ -625,16 +625,16 @@
else
_playerV2 = new Player_V2(this);
} else {
- _imuse = IMuse::create (syst, detector->createMidi());
+ _imuse = IMuse::create (syst, _mixer, detector->createMidi());
if (_imuse) {
if (detector->_gameTempo != 0)
_imuse->property(IMuse::PROP_TEMPO_BASE, detector->_gameTempo);
- _imuse->property (IMuse::PROP_OLD_ADLIB_INSTRUMENTS, (_features & GF_SMALL_HEADER) ? 1 : 0);
- _imuse->property (IMuse::PROP_MULTI_MIDI, detector->_multi_midi);
- _imuse->property (IMuse::PROP_NATIVE_MT32, detector->_native_mt32);
+ _imuse->property(IMuse::PROP_OLD_ADLIB_INSTRUMENTS, (_features & GF_SMALL_HEADER) ? 1 : 0);
+ _imuse->property(IMuse::PROP_MULTI_MIDI, detector->_multi_midi);
+ _imuse->property(IMuse::PROP_NATIVE_MT32, detector->_native_mt32);
if (_features & GF_HUMONGOUS) {
- _imuse->property (IMuse::PROP_LIMIT_PLAYERS, 1);
- _imuse->property (IMuse::PROP_RECYCLE_PLAYERS, 1);
+ _imuse->property(IMuse::PROP_LIMIT_PLAYERS, 1);
+ _imuse->property(IMuse::PROP_RECYCLE_PLAYERS, 1);
}
_imuse->set_music_volume(_sound->_sound_volume_music);
}
Index: imuse_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_player.cpp,v
retrieving revision 2.15
retrieving revision 2.16
diff -u -d -r2.15 -r2.16
--- imuse_player.cpp 1 Aug 2003 20:39:16 -0000 2.15
+++ imuse_player.cpp 5 Aug 2003 23:58:24 -0000 2.16
@@ -20,12 +20,15 @@
*/
#include "stdafx.h"
-#include "scumm/scumm.h"
-#include "sound/midiparser.h"
-#include "scumm/saveload.h"
+
#include "common/util.h"
#include "common/engine.h"
-#include "imuse_internal.h"
+
+#include "scumm/imuse_internal.h"
+#include "scumm/saveload.h"
+#include "scumm/scumm.h"
+
+#include "sound/midiparser.h"
Index: imuse_internal.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_internal.h,v
retrieving revision 2.11
retrieving revision 2.12
diff -u -d -r2.11 -r2.12
--- imuse_internal.h 1 Aug 2003 20:39:16 -0000 2.11
+++ imuse_internal.h 5 Aug 2003 23:58:24 -0000 2.12
@@ -22,9 +22,9 @@
#ifndef DEFINED_IMUSE_INTERNAL
#define DEFINED_IMUSE_INTERNAL
-#include "sound/mididrv.h"
#include "common/scummsys.h"
#include "scumm/instrument.h"
+#include "sound/mididrv.h"
// Unremark this statement to activate some of
// the most common iMuse diagnostic messages.
@@ -45,6 +45,7 @@
class MidiParser;
class Scumm;
class OSystem;
+class SoundMixer;
@@ -355,6 +356,8 @@
MidiDriver *_midi_native;
byte **_base_sounds;
+
+ SoundMixer *_mixer;
private:
bool _paused;
@@ -439,7 +442,7 @@
IMuseInternal();
~IMuseInternal();
- int initialize(OSystem *syst, MidiDriver *midi);
+ int initialize(OSystem *syst, SoundMixer *mixer, MidiDriver *midi);
void reallocateMidiChannels(MidiDriver *midi);
void setGlobalAdlibInstrument(byte slot, byte *data);
void copyGlobalAdlibInstrument(byte slot, Instrument *dest);
@@ -465,7 +468,7 @@
uint32 property(int prop, uint32 value);
MidiDriver *getMidiDriver();
- static IMuseInternal *create(OSystem *syst, MidiDriver *midi);
+ static IMuseInternal *create(OSystem *syst, SoundMixer *mixer, MidiDriver *midi);
};
#endif
Index: imuse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- imuse.h 1 Aug 2003 20:39:15 -0000 1.37
+++ imuse.h 5 Aug 2003 23:58:24 -0000 1.38
@@ -74,7 +74,7 @@
MidiDriver *getMidiDriver();
// Factory methods
- static IMuse *create(OSystem *syst, MidiDriver *midi);
+ static IMuse *create(OSystem *syst, SoundMixer *mixer, MidiDriver *midi);
};
#endif
Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.71
retrieving revision 2.72
diff -u -d -r2.71 -r2.72
--- imuse.cpp 1 Aug 2003 20:39:15 -0000 2.71
+++ imuse.cpp 5 Aug 2003 23:58:24 -0000 2.72
@@ -21,15 +21,18 @@
*/
#include "stdafx.h"
-#include "imuse.h"
-#include "imuse_internal.h"
-#include "instrument.h"
-#include "saveload.h"
-#include "scumm.h"
+
#include "common/util.h"
-#include "sound/mididrv.h"
#include "common/gameDetector.h" // For kDefaultMasterVolume etc.
+#include "scumm/imuse.h"
+#include "scumm/imuse_internal.h"
+#include "scumm/instrument.h"
+#include "scumm/saveload.h"
+#include "scumm/scumm.h"
+
+#include "sound/mididrv.h"
+
////////////////////////////////////////
@@ -78,7 +81,7 @@
} else {
// Route it through Adlib anyway.
if (!_midi_adlib) {
- _midi_adlib = MidiDriver_ADLIB_create();
+ _midi_adlib = MidiDriver_ADLIB_create(_mixer);
initMidiDriver(_midi_adlib);
}
driver = _midi_adlib;
@@ -186,14 +189,14 @@
} else {
// Route it through Adlib anyway.
if (!_midi_adlib) {
- _midi_adlib = MidiDriver_ADLIB_create();
+ _midi_adlib = MidiDriver_ADLIB_create(_mixer);
initMidiDriver(_midi_adlib);
}
driver = _midi_adlib;
}
} else {
if (!_midi_adlib &&(_enable_multi_midi || !_midi_native)) {
- _midi_adlib = MidiDriver_ADLIB_create();
+ _midi_adlib = MidiDriver_ADLIB_create(_mixer);
initMidiDriver(_midi_adlib);
}
driver = _midi_adlib;
@@ -1048,6 +1051,7 @@
_players[i].clear();
}
driver->close();
+ // FIXME: shouldn't we delete 'driver' here, too ?
}
break;
@@ -1072,15 +1076,16 @@
_base_sounds = base;
}
-IMuseInternal *IMuseInternal::create(OSystem *syst, MidiDriver *native_midi) {
+IMuseInternal *IMuseInternal::create(OSystem *syst, SoundMixer *mixer, MidiDriver *native_midi) {
IMuseInternal *i = new IMuseInternal;
- i->initialize(syst, native_midi);
+ i->initialize(syst, mixer, native_midi);
return i;
}
-int IMuseInternal::initialize(OSystem *syst, MidiDriver *native_midi) {
+int IMuseInternal::initialize(OSystem *syst, SoundMixer *mixer, MidiDriver *native_midi) {
int i;
+ _mixer = mixer;
_midi_native = native_midi;
_midi_adlib = NULL;
if (native_midi)
@@ -1736,7 +1741,7 @@
// The IMuse::create method provides a front-end factory
// for creating IMuseInternal without exposing that class
// to the client.
-IMuse *IMuse::create(OSystem *syst, MidiDriver *midi) {
- IMuseInternal *engine = IMuseInternal::create(syst, midi);
+IMuse *IMuse::create(OSystem *syst, SoundMixer *mixer, MidiDriver *midi) {
+ IMuseInternal *engine = IMuseInternal::create(syst, mixer, midi);
return new IMuse(syst, engine);
}
More information about the Scummvm-git-logs
mailing list