libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-01 08:23:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More IMuse cleanup

Browse Source 
svn-id: r7578
This commit is contained in:
Jamieson Christian 2003-05-16 20:38:04 +00:00
parent 0ece527a69
commit 053e7cb71e
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scumm/imuse.cpp
View File

@ -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 @@ public:
}
~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 @@ public:
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 @@ void IMuseInternal::setBase(byte **base) {
_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 @@ uint32 IMuse::property(int prop, uint32 value) { in(); uint32 ret = _target->pro
// 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);

3
scumm/imuse.h
View File

@ -65,8 +65,7 @@ public:
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

2
scumm/scummvm.cpp
View File

@ -600,7 +600,7 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst)
_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);