[Scummvm-cvs-logs] CVS: scummvm/sound mididrv.cpp,1.44,1.45 mididrv.h,1.28,1.29 mpu401.h,1.15,1.16
Jamieson Christian
jamieson630 at users.sourceforge.net
Sun Oct 5 08:37:11 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm imuse_internal.h,2.29,2.30 imuse_player.cpp,2.36,2.37 midiparser_eup.cpp,1.6,1.7 scummvm.cpp,2.424,2.425
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm midiparser_eup.cpp,1.7,1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv26583/sound
Modified Files:
mididrv.cpp mididrv.h mpu401.h
Log Message:
Preliminary preparation for new YM2612 FM emulator.
All the hooks are in, but actual implementation
needs to be checked for portability.
Index: mididrv.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mididrv.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- mididrv.cpp 2 Oct 2003 22:52:56 -0000 1.44
+++ mididrv.cpp 5 Oct 2003 15:36:52 -0000 1.45
@@ -54,6 +54,7 @@
{"adlib", "Adlib", MD_ADLIB},
{"pcspk", "PC Speaker", MD_PCSPK},
{"pcjr", "IBM PCjr", MD_PCJR},
+ {"towns", "FM Towns", MD_TOWNS},
#endif
#if defined(__PALM_OS__)
Index: mididrv.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mididrv.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- mididrv.h 2 Oct 2003 22:52:56 -0000 1.28
+++ mididrv.h 5 Oct 2003 15:36:52 -0000 1.29
@@ -44,8 +44,8 @@
MD_ADLIB = 10,
MD_PCSPK = 11,
MD_PCJR = 12,
-
- MD_YPA1 = 100 // palmos
+ MD_TOWNS = 13,
+ MD_YPA1 = 14 // PalmOS
};
/**
@@ -144,16 +144,16 @@
// Control Change messages
virtual void controlChange (byte control, byte value) = 0;
- virtual void modulationWheel (byte value) = 0;
- virtual void volume (byte value) = 0;
- virtual void panPosition (byte value) = 0;
+ virtual void modulationWheel (byte value) { controlChange (1, value); }
+ virtual void volume (byte value) { controlChange (7, value); }
+ virtual void panPosition (byte value) { controlChange (10, value); }
virtual void pitchBendFactor (byte value) = 0;
- virtual void detune (byte value) = 0;
- virtual void priority (byte value) = 0;
- virtual void sustain (bool value) = 0;
- virtual void effectLevel (byte value) = 0;
- virtual void chorusLevel (byte value) = 0;
- virtual void allNotesOff() = 0;
+ virtual void detune (byte value) { controlChange (17, value); }
+ virtual void priority (byte value) { controlChange (18, value); }
+ virtual void sustain (bool value) { controlChange (64, value ? 1 : 0); }
+ virtual void effectLevel (byte value) { controlChange (91, value); }
+ virtual void chorusLevel (byte value) { controlChange (93, value); }
+ virtual void allNotesOff() { controlChange (123, 0); }
// SysEx messages
virtual void sysEx_customInstrument (uint32 type, byte *instr) = 0;
@@ -169,6 +169,7 @@
extern MidiDriver *MidiDriver_CORE_create();
extern MidiDriver *MidiDriver_ETUDE_create();
extern MidiDriver *MidiDriver_ALSA_create();
+extern MidiDriver *MidiDriver_YM2612_create(SoundMixer *mixer);
extern MidiDriver *MidiDriver_YamahaPa1_create();
#endif
Index: mpu401.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mpu401.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- mpu401.h 26 Sep 2003 14:05:33 -0000 1.15
+++ mpu401.h 5 Oct 2003 15:36:52 -0000 1.16
@@ -59,16 +59,7 @@
// Control Change messages
void controlChange (byte control, byte value);
- void modulationWheel (byte value) { controlChange (1, value); }
- void volume (byte value) { controlChange (7, value); }
- void panPosition (byte value) { controlChange (10, value); }
void pitchBendFactor (byte value);
- void detune (byte value) { controlChange (17, value); }
- void priority (byte value) { controlChange (18, value); }
- void sustain (bool value) { controlChange (64, value ? 1 : 0); }
- void effectLevel (byte value) { controlChange (91, value); }
- void chorusLevel (byte value) { controlChange (93, value); }
- void allNotesOff() { controlChange (123, 0); }
// SysEx messages
void sysEx_customInstrument (uint32 type, byte *instr);
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm imuse_internal.h,2.29,2.30 imuse_player.cpp,2.36,2.37 midiparser_eup.cpp,1.6,1.7 scummvm.cpp,2.424,2.425
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm midiparser_eup.cpp,1.7,1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list