[Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,2.34,2.35 imuse.h,1.28,1.29 scummvm.cpp,2.152,2.153
Jamieson Christian
jamieson630 at users.sourceforge.net
Fri May 16 13:39:04 CEST 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv20088/scummvm/scumm
Modified Files:
imuse.cpp imuse.h scummvm.cpp
Log Message:
More IMuse cleanup
Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.34
retrieving revision 2.35
diff -u -d -r2.34 -r2.35
--- imuse.cpp 16 May 2003 19:16:43 -0000 2.34
+++ imuse.cpp 16 May 2003 20:38:02 -0000 2.35
@@ -21,12 +21,10 @@
#include "stdafx.h"
#include "scumm/scumm.h"
-#include "sound/fmopl.h"
#include "sound/mididrv.h"
#include "scumm/imuse.h"
#include "scumm/instrument.h"
#include "scumm/saveload.h"
-#include "scumm/sound.h"
#include "common/util.h"
// Unremark this statement to activate some of
@@ -382,7 +380,7 @@
}
~IMuseInternal();
- int initialize(OSystem *syst, MidiDriver *midi, SoundMixer *mixer);
+ int initialize(OSystem *syst, MidiDriver *midi);
void reallocateMidiChannels (MidiDriver *midi);
void setGlobalAdlibInstrument (byte slot, byte *data);
void copyGlobalAdlibInstrument (byte slot, Instrument *dest);
@@ -408,7 +406,7 @@
uint32 property(int prop, uint32 value);
- static IMuseInternal *create(OSystem *syst, MidiDriver *midi, SoundMixer *mixer);
+ static IMuseInternal *create(OSystem *syst, MidiDriver *midi);
};
////////////////////////////////////////
@@ -1615,13 +1613,13 @@
_base_sounds = base;
}
-IMuseInternal *IMuseInternal::create(OSystem *syst, MidiDriver *midi, SoundMixer *mixer) {
+IMuseInternal *IMuseInternal::create(OSystem *syst, MidiDriver *midi) {
IMuseInternal *i = new IMuseInternal;
- i->initialize(syst, midi, mixer);
+ i->initialize(syst, midi);
return i;
}
-int IMuseInternal::initialize(OSystem *syst, MidiDriver *midi, SoundMixer *mixer) {
+int IMuseInternal::initialize(OSystem *syst, MidiDriver *midi) {
int i;
if (midi == NULL)
@@ -3416,8 +3414,8 @@
// 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, SoundMixer *mixer) {
- IMuseInternal *engine = IMuseInternal::create (syst, midi, mixer);
+IMuse *IMuse::create (OSystem *syst, MidiDriver *midi) {
+ IMuseInternal *engine = IMuseInternal::create (syst, midi);
if (midi)
midi->property (MidiDriver::PROP_SMALLHEADER, (g_scumm->_features & GF_SMALL_HEADER) ? 1 : 0);
return new IMuse (syst, engine);
Index: imuse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- imuse.h 16 May 2003 01:52:45 -0000 1.28
+++ imuse.h 16 May 2003 20:38:03 -0000 1.29
@@ -65,8 +65,7 @@
uint32 property(int prop, uint32 value);
// Factory methods
- static IMuse *create(OSystem *syst, MidiDriver *midi, SoundMixer *mixer);
- static IMuse *create_midi(OSystem *syst, MidiDriver *midi) { return create(syst, midi, NULL); }
+ static IMuse *create(OSystem *syst, MidiDriver *midi);
};
#endif
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.152
retrieving revision 2.153
diff -u -d -r2.152 -r2.153
--- scummvm.cpp 16 May 2003 11:45:05 -0000 2.152
+++ scummvm.cpp 16 May 2003 20:38:04 -0000 2.153
@@ -600,7 +600,7 @@
_imuse = NULL;
} else {
_imuseDigital = NULL;
- _imuse = IMuse::create_midi(syst, detector->createMidi());
+ _imuse = IMuse::create (syst, detector->createMidi());
if (_imuse) {
if (detector->_gameTempo != 0)
_imuse->property(IMuse::PROP_TEMPO_BASE, detector->_gameTempo);
More information about the Scummvm-git-logs
mailing list