[Scummvm-cvs-logs] CVS: scummvm/backends/midi adlib.cpp,1.13,1.14 alsa.cpp,1.4,1.5 coreaudio.cpp,1.3,1.4 null.cpp,1.3,1.4 quicktime.cpp,1.2,1.3 windows.cpp,1.5,1.6
Pawel Kolodziejski
aquadran at users.sourceforge.net
Thu Mar 6 10:28:17 CET 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/backends/null null.cpp,1.2,1.3
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/sdl fb2opengl.h,1.6,1.7 sdl-common.cpp,1.33,1.34 sdl-common.h,1.15,1.16 sdl.cpp,1.22,1.23 sdl_gl.cpp,1.20,1.21
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/backends/midi
In directory sc8-pr-cvs1:/tmp/cvs-serv27088/midi
Modified Files:
adlib.cpp alsa.cpp coreaudio.cpp null.cpp quicktime.cpp
windows.cpp
Log Message:
and more cleanup ....
Index: adlib.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/adlib.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- adlib.cpp 10 Feb 2003 11:51:23 -0000 1.13
+++ adlib.cpp 6 Mar 2003 18:26:41 -0000 1.14
@@ -431,8 +431,7 @@
62, 63, 63, 63
};
-static int lookup_volume(int a, int b)
-{
+static int lookup_volume(int a, int b) {
if (b == 0)
return 0;
@@ -458,8 +457,7 @@
}
}
-static void create_lookup_table()
-{
+static void create_lookup_table() {
int i, j;
int sum;
@@ -476,8 +474,6 @@
typedef void TimerCallback (void *);
-
-
////////////////////////////////////////
//
// Adlib MIDI driver
@@ -570,34 +566,28 @@
static void premix_proc(void *param, int16 *buf, uint len);
};
-
-
// MidiChannel method implementations
void AdlibPart::init (MidiDriver_ADLIB *owner, byte channel) {
_owner = owner;
_channel = channel;
-
}
-MidiDriver *AdlibPart::device()
-{
+MidiDriver *AdlibPart::device() {
return _owner;
}
-void AdlibPart::noteOff (byte note)
-{
+void AdlibPart::noteOff (byte note) {
_owner->part_key_off (this, note);
}
-void AdlibPart::noteOn (byte note, byte velocity)
-{
+void AdlibPart::noteOn (byte note, byte velocity) {
_owner->part_key_on (this, note, velocity);
}
-void AdlibPart::programChange (byte program)
-{
- if (program > 127) return;
+void AdlibPart::programChange (byte program) {
+ if (program > 127)
+ return;
uint i;
uint count = 0;
@@ -609,8 +599,7 @@
_owner->part_set_instrument (this, (AdlibInstrument *) &map_gm_to_fm [program]);
}
-void AdlibPart::pitchBend (int16 bend)
-{
+void AdlibPart::pitchBend (int16 bend) {
MidiChannelAdl *mc;
_pitchbend = bend;
@@ -620,8 +609,7 @@
}
}
-void AdlibPart::controlChange (byte control, byte value)
-{
+void AdlibPart::controlChange (byte control, byte value) {
switch (control) {
case 1: modulationWheel (value); break;
case 7: volume (value); break;
@@ -640,8 +628,7 @@
}
}
-void AdlibPart::modulationWheel (byte value)
-{
+void AdlibPart::modulationWheel (byte value) {
MidiChannelAdl *mc;
_modwheel = value;
@@ -653,8 +640,7 @@
}
}
-void AdlibPart::volume (byte value)
-{
+void AdlibPart::volume (byte value) {
MidiChannelAdl *mc;
_vol_eff = value;
@@ -666,8 +652,7 @@
}
}
-void AdlibPart::pitchBendFactor (byte value)
-{
+void AdlibPart::pitchBendFactor (byte value) {
MidiChannelAdl *mc;
_pitchbend_factor = value;
@@ -677,8 +662,7 @@
}
}
-void AdlibPart::detune (byte value)
-{
+void AdlibPart::detune (byte value) {
MidiChannelAdl *mc;
_detune_eff = value;
@@ -688,13 +672,11 @@
}
}
-void AdlibPart::priority (byte value)
-{
+void AdlibPart::priority (byte value) {
_pri_eff = value;
}
-void AdlibPart::sustain (bool value)
-{
+void AdlibPart::sustain (bool value) {
MidiChannelAdl *mc;
_pedal = value;
@@ -706,23 +688,18 @@
}
}
-void AdlibPart::allNotesOff()
-{
+void AdlibPart::allNotesOff() {
while (_mc)
_owner->mc_off (_mc);
}
-void AdlibPart::sysEx_customInstrument (uint32 type, byte *instr)
-{
+void AdlibPart::sysEx_customInstrument (uint32 type, byte *instr) {
_owner->sysEx_customInstrument (this, type, instr);
}
-
-
// MidiDriver method implementations
-MidiDriver_ADLIB::MidiDriver_ADLIB()
-{
+MidiDriver_ADLIB::MidiDriver_ADLIB() {
uint i;
for (i = 0; i < ARRAYSIZE(_parts); ++i) {
_parts[i].init (this, i);
@@ -731,8 +708,7 @@
_isOpen = false;
}
-int MidiDriver_ADLIB::open ()
-{
+int MidiDriver_ADLIB::open() {
if (_isOpen)
return MERR_ALREADY_OPEN;
_isOpen = true;
@@ -765,8 +741,7 @@
return 0;
}
-void MidiDriver_ADLIB::close()
-{
+void MidiDriver_ADLIB::close() {
uint i;
for (i = 0; i < ARRAYSIZE(_midi_channels); ++i) {
if (_midi_channels [i]._part)
@@ -779,8 +754,7 @@
_isOpen = false;
}
-void MidiDriver_ADLIB::send (uint32 b)
-{
+void MidiDriver_ADLIB::send (uint32 b) {
//byte param3 = (byte) ((b >> 24) & 0xFF);
byte param2 = (byte) ((b >> 16) & 0xFF);
byte param1 = (byte) ((b >> 8) & 0xFF);
@@ -790,13 +764,16 @@
switch (cmd) {
case 0x80:// Note Off
- part_key_off (part, param1); break;
+ part_key_off (part, param1);
+ break;
case 0x90: // Note On
- part_key_on (part, param1, param2); break;
+ part_key_on (part, param1, param2);
+ break;
case 0xA0: // Aftertouch
break; // Not supported.
case 0xB0: // Control Change
- part->controlChange (param1, param2); break;
+ part->controlChange (param1, param2);
+ break;
case 0xC0: // Program Change
if (chan != 9)
part->programChange (param1);
@@ -804,7 +781,8 @@
case 0xD0: // Channel Pressure
break; // Not supported.
case 0xE0: // Pitch Bend
- part->pitchBend ((param1 | (param2 << 7)) - 0x2000); break;
+ part->pitchBend ((param1 | (param2 << 7)) - 0x2000);
+ break;
case 0xF0: // SysEx
// We should never get here! SysEx information has to be
// sent via high-level semantic methods.
@@ -816,8 +794,7 @@
}
}
-uint32 MidiDriver_ADLIB::property (int prop, uint32 param)
-{
+uint32 MidiDriver_ADLIB::property (int prop, uint32 param) {
switch (prop) {
case PROP_SMALLHEADER: // Indicates older game, use different operator volume algorithm
_game_SmallHeader = (param > 0);
@@ -827,42 +804,37 @@
return 0;
}
-void MidiDriver_ADLIB::setPitchBendRange (byte channel, uint range)
-{
+void MidiDriver_ADLIB::setPitchBendRange (byte channel, uint range) {
MidiChannelAdl *mc;
AdlibPart *part = &_parts [channel];
part->_pitchbend_factor = range;
for (mc = part->_mc; mc; mc = mc->_next) {
adlib_note_on(mc->_channel, mc->_note + part->_transpose_eff,
- (part->_pitchbend * part->_pitchbend_factor >> 6) + part->_detune_eff);
+ (part->_pitchbend * part->_pitchbend_factor >> 6) + part->_detune_eff);
}
}
-void MidiDriver_ADLIB::sysEx_customInstrument (byte channel, uint32 type, byte *instr)
-{
+void MidiDriver_ADLIB::sysEx_customInstrument (byte channel, uint32 type, byte *instr) {
sysEx_customInstrument (&_parts [channel], type, instr);
}
-void MidiDriver_ADLIB::sysEx_customInstrument (AdlibPart *part, uint32 type, byte *instr)
-{
+void MidiDriver_ADLIB::sysEx_customInstrument (AdlibPart *part, uint32 type, byte *instr) {
if (type == 'ADL ') {
AdlibInstrument *i = &part->_part_instr;
memcpy(i, instr, sizeof(AdlibInstrument));
}
}
-void MidiDriver_ADLIB::setTimerCallback (void *timer_param, void (*timer_proc) (void *))
-{
+void MidiDriver_ADLIB::setTimerCallback (void *timer_param, void (*timer_proc) (void *)) {
_timer_proc = (TimerCallback *) timer_proc;
_timer_param = timer_param;
}
-MidiChannel *MidiDriver_ADLIB::allocateChannel()
-{
+MidiChannel *MidiDriver_ADLIB::allocateChannel() {
AdlibPart *part;
uint i;
-
+
for (i = 0; i < ARRAYSIZE(_parts); ++i) {
part = &_parts[i];
if (!part->_allocated) {
@@ -873,22 +845,17 @@
return NULL;
}
-MidiDriver *MidiDriver_ADLIB_create()
-{
+MidiDriver *MidiDriver_ADLIB_create() {
return new MidiDriver_ADLIB();
}
-
-
// All the code brought over from IMuseAdlib
-void MidiDriver_ADLIB::premix_proc(void *param, int16 *buf, uint len)
-{
+void MidiDriver_ADLIB::premix_proc(void *param, int16 *buf, uint len) {
((MidiDriver_ADLIB *) param)->generate_samples(buf, len);
}
-void MidiDriver_ADLIB::adlib_write(byte port, byte value)
-{
+void MidiDriver_ADLIB::adlib_write(byte port, byte value) {
if (_adlib_reg_cache[port] == value)
return;
_adlib_reg_cache[port] = value;
@@ -896,8 +863,7 @@
OPLWriteReg(_opl, port, value);
}
-void MidiDriver_ADLIB::generate_samples(int16 *data, int len)
-{
+void MidiDriver_ADLIB::generate_samples(int16 *data, int len) {
int step;
if (!_opl) {
@@ -921,13 +887,11 @@
} while (len -= step);
}
-void MidiDriver_ADLIB::reset_tick()
-{
+void MidiDriver_ADLIB::reset_tick() {
_next_tick = 88;
}
-void MidiDriver_ADLIB::on_timer()
-{
+void MidiDriver_ADLIB::on_timer() {
MidiChannelAdl *mc;
int i;
@@ -952,8 +916,7 @@
}
}
-void MidiDriver_ADLIB::mc_off(MidiChannelAdl * mc2)
-{
+void MidiDriver_ADLIB::mc_off(MidiChannelAdl * mc2) {
MidiChannelAdl *mc = (MidiChannelAdl *)mc2, *tmp;
adlib_key_off(mc->_channel);
@@ -969,8 +932,7 @@
mc->_part = NULL;
}
-void MidiDriver_ADLIB::mc_inc_stuff(MidiChannelAdl *mc, Struct10 * s10, Struct11 * s11)
-{
+void MidiDriver_ADLIB::mc_inc_stuff(MidiChannelAdl *mc, Struct10 *s10, Struct11 *s11) {
byte code;
AdlibPart *part = mc->_part;
@@ -981,15 +943,15 @@
case 0:
mc->_vol_2 = s10->start_value + s11->modify_val;
adlib_set_param(mc->_channel, 0,
- volume_table[lookup_table[mc->_vol_2]
- [part->_vol_eff >> 2]]);
+ volume_table[lookup_table[mc->_vol_2]
+ [part->_vol_eff >> 2]]);
break;
case 13:
mc->_vol_1 = s10->start_value + s11->modify_val;
if (mc->_twochan) {
adlib_set_param(mc->_channel, 13,
- volume_table[lookup_table[mc->_vol_1]
- [part->_vol_eff >> 2]]);
+ volume_table[lookup_table[mc->_vol_1]
+ [part->_vol_eff >> 2]]);
} else {
adlib_set_param(mc->_channel, 13, mc->_vol_1);
}
@@ -1002,7 +964,7 @@
break;
default:
adlib_set_param(mc->_channel, s11->param,
- s10->start_value + s11->modify_val);
+ s10->start_value + s11->modify_val);
break;
}
}
@@ -1011,14 +973,12 @@
adlib_key_onoff(mc->_channel);
}
-void MidiDriver_ADLIB::adlib_key_off(int chan)
-{
+void MidiDriver_ADLIB::adlib_key_off(int chan){
byte port = chan + 0xB0;
adlib_write(port, adlib_read(port) & ~0x20);
}
-byte MidiDriver_ADLIB::struct10_ontimer(Struct10 * s10, Struct11 * s11)
-{
+byte MidiDriver_ADLIB::struct10_ontimer(Struct10 *s10, Struct11 *s11) {
byte result = 0;
int i;
@@ -1061,8 +1021,7 @@
return result;
}
-void MidiDriver_ADLIB::adlib_set_param(int channel, byte param, int value)
-{
+void MidiDriver_ADLIB::adlib_set_param(int channel, byte param, int value) {
const AdlibSetParams *as;
byte port;
@@ -1096,8 +1055,7 @@
adlib_write(port, (adlib_read(port) & ~as->c) | (((byte)value) << as->b));
}
-void MidiDriver_ADLIB::adlib_key_onoff(int channel)
-{
+void MidiDriver_ADLIB::adlib_key_onoff(int channel) {
byte val;
byte port = channel + 0xB0;
assert(channel >= 0 && channel < 9);
@@ -1107,8 +1065,7 @@
adlib_write(port, val | 0x20);
}
-void MidiDriver_ADLIB::struct10_setup(Struct10 * s10)
-{
+void MidiDriver_ADLIB::struct10_setup(Struct10 *s10) {
int b, c, d, e, f, g, h;
byte t;
@@ -1157,8 +1114,7 @@
s10->speed_lo_counter = 0;
}
-void MidiDriver_ADLIB::adlib_playnote(int channel, int note)
-{
+void MidiDriver_ADLIB::adlib_playnote(int channel, int note) {
byte old, oct, notex;
int note2;
int i;
@@ -1189,8 +1145,7 @@
adlib_write(channel + 0xB0, oct | 0x20);
}
-int MidiDriver_ADLIB::random_nr(int a)
-{
+int MidiDriver_ADLIB::random_nr(int a) {
static byte _rand_seed = 1;
if (_rand_seed & 1) {
_rand_seed >>= 1;
@@ -1201,8 +1156,7 @@
return _rand_seed * a >> 8;
}
-void MidiDriver_ADLIB::part_key_off (AdlibPart *part, byte note)
-{
+void MidiDriver_ADLIB::part_key_off (AdlibPart *part, byte note) {
MidiChannelAdl *mc;
for (mc = part->_mc; mc; mc = mc->_next) {
@@ -1215,8 +1169,7 @@
}
}
-void MidiDriver_ADLIB::part_key_on (AdlibPart *part, byte note, byte velocity)
-{
+void MidiDriver_ADLIB::part_key_on (AdlibPart *part, byte note, byte velocity) {
MidiChannelAdl *mc;
mc = allocate_midichan(part->_pri_eff);
@@ -1227,8 +1180,7 @@
mc_key_on(mc, note, velocity);
}
-MidiChannelAdl *MidiDriver_ADLIB::allocate_midichan(byte pri)
-{
+MidiChannelAdl *MidiDriver_ADLIB::allocate_midichan(byte pri) {
MidiChannelAdl *ac, *best = NULL;
int i;
@@ -1251,8 +1203,7 @@
return best;
}
-void MidiDriver_ADLIB::link_mc (AdlibPart *part, MidiChannelAdl *mc)
-{
+void MidiDriver_ADLIB::link_mc (AdlibPart *part, MidiChannelAdl *mc) {
mc->_part = part;
mc->_next = (MidiChannelAdl *)part->_mc;
part->_mc = mc;
@@ -1262,8 +1213,7 @@
mc->_next->_prev = mc;
}
-void MidiDriver_ADLIB::mc_key_on (MidiChannelAdl * mc2, byte note, byte velocity)
-{
+void MidiDriver_ADLIB::mc_key_on (MidiChannelAdl *mc2, byte note, byte velocity) {
MidiChannelAdl *mc = (MidiChannelAdl *)mc2;
AdlibPart *part = mc->_part;
AdlibInstrument *instr = &part->_part_instr;
@@ -1309,8 +1259,7 @@
}
}
-void MidiDriver_ADLIB::adlib_setup_channel(int chan, AdlibInstrument * instr, byte vol_1, byte vol_2)
-{
+void MidiDriver_ADLIB::adlib_setup_channel(int chan, AdlibInstrument *instr, byte vol_1, byte vol_2) {
byte port;
assert(chan >= 0 && chan < 9);
@@ -1348,10 +1297,8 @@
}
void MidiDriver_ADLIB::mc_init_stuff (MidiChannelAdl *mc, Struct10 * s10,
- Struct11 * s11, byte flags, InstrumentExtra * ie)
-{
+ Struct11 * s11, byte flags, InstrumentExtra * ie) {
AdlibPart *part = mc->_part;
-
s11->modify_val = 0;
s11->flag0x40 = flags & 0x40;
s10->loop = flags & 0x20;
@@ -1387,8 +1334,7 @@
struct10_init(s10, ie);
}
-void MidiDriver_ADLIB::struct10_init(Struct10 * s10, InstrumentExtra * ie)
-{
+void MidiDriver_ADLIB::struct10_init(Struct10 *s10, InstrumentExtra *ie) {
s10->active = 1;
s10->cur_val = 0;
s10->modwheel_last = 31;
@@ -1408,8 +1354,7 @@
struct10_setup(s10);
}
-int MidiDriver_ADLIB::adlib_read_param(int chan, byte param)
-{
+int MidiDriver_ADLIB::adlib_read_param(int chan, byte param) {
const AdlibSetParams *as;
byte val;
byte port;
@@ -1442,8 +1387,7 @@
return val;
}
-void MidiDriver_ADLIB::adlib_note_on(int chan, byte note, int mod)
-{
+void MidiDriver_ADLIB::adlib_note_on(int chan, byte note, int mod) {
int code;
assert(chan >= 0 && chan < 9);
code = (note << 7) + mod;
@@ -1451,8 +1395,7 @@
adlib_playnote(chan, channel_table_2[chan] + code);
}
-void MidiDriver_ADLIB::part_set_instrument(AdlibPart *part, AdlibInstrument * instr)
-{
+void MidiDriver_ADLIB::part_set_instrument(AdlibPart *part, AdlibInstrument *instr) {
AdlibInstrument *i = &part->_part_instr;
memcpy(i, instr, sizeof(AdlibInstrument));
}
Index: alsa.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/alsa.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- alsa.cpp 30 Dec 2002 06:24:59 -0000 1.4
+++ alsa.cpp 6 Mar 2003 18:26:42 -0000 1.5
@@ -70,8 +70,7 @@
{
}
-int MidiDriver_ALSA::open()
-{
+int MidiDriver_ALSA::open() {
char *var;
unsigned int caps;
@@ -128,16 +127,13 @@
return 0;
}
-void MidiDriver_ALSA::close()
-{
+void MidiDriver_ALSA::close() {
_isOpen = false;
if (seq_handle)
snd_seq_close(seq_handle);
}
-
-void MidiDriver_ALSA::send(uint32 b)
-{
+void MidiDriver_ALSA::send(uint32 b) {
unsigned int midiCmd[4];
ev.type = SND_SEQ_EVENT_OSS;
@@ -168,7 +164,6 @@
snd_seq_ev_set_pgmchange(&ev, chanID, midiCmd[1]);
send_event(0);
break;
-
case 0xE0:{
// long theBend = ((((long)midiCmd[1] + (long)(midiCmd[2] << 7))) - 0x2000) / 4;
// snd_seq_ev_set_pitchbend(&ev, chanID, theBend);
@@ -186,8 +181,7 @@
}
}
-int MidiDriver_ALSA::parse_addr(char *arg, int *client, int *port)
-{
+int MidiDriver_ALSA::parse_addr(char *arg, int *client, int *port) {
char *p;
if (isdigit(*arg)) {
@@ -205,8 +199,7 @@
return 0;
}
-void MidiDriver_ALSA::send_event(int do_flush)
-{
+void MidiDriver_ALSA::send_event(int do_flush) {
snd_seq_ev_set_direct(&ev);
snd_seq_ev_set_source(&ev, my_port);
snd_seq_ev_set_dest(&ev, seq_client, seq_port);
@@ -216,8 +209,7 @@
snd_seq_flush_output(seq_handle);
}
-MidiDriver *MidiDriver_ALSA_create()
-{
+MidiDriver *MidiDriver_ALSA_create() {
return new MidiDriver_ALSA();
}
Index: coreaudio.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/coreaudio.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- coreaudio.cpp 3 Mar 2003 22:39:04 -0000 1.3
+++ coreaudio.cpp 6 Mar 2003 18:26:43 -0000 1.4
@@ -50,8 +50,7 @@
};
-int MidiDriver_CORE::open()
-{
+int MidiDriver_CORE::open() {
if (au_output != NULL)
return MERR_ALREADY_OPEN;
@@ -90,8 +89,7 @@
return 0;
}
-void MidiDriver_CORE::close()
-{
+void MidiDriver_CORE::close() {
// Stop the output
AudioOutputUnitStop(au_output);
@@ -100,8 +98,7 @@
CloseComponent(au_MusicDevice);
}
-void MidiDriver_CORE::send(uint32 b)
-{
+void MidiDriver_CORE::send(uint32 b) {
unsigned char first_byte, seccond_byte, status_byte;
status_byte = (b & 0x000000FF);
first_byte = (b & 0x0000FF00) >> 8;
@@ -115,13 +112,11 @@
MusicDeviceMIDIEvent(au_MusicDevice, status_byte, first_byte, seccond_byte, 0);
}
-void MidiDriver_CORE::sysEx(byte *msg, uint16 length)
-{
+void MidiDriver_CORE::sysEx(byte *msg, uint16 length) {
MusicDeviceSysEx(au_MusicDevice, msg, length);
}
-MidiDriver *MidiDriver_CORE_create()
-{
+MidiDriver *MidiDriver_CORE_create() {
return new MidiDriver_CORE();
}
Index: null.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/null.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- null.cpp 11 Dec 2002 16:09:54 -0000 1.3
+++ null.cpp 6 Mar 2003 18:26:44 -0000 1.4
@@ -30,13 +30,11 @@
void send(uint32 b) { }
};
-int MidiDriver_NULL::open()
-{
+int MidiDriver_NULL::open() {
warning("Music not enabled - MIDI support selected with no MIDI driver available. Try Adlib");
return 0;
}
-MidiDriver *MidiDriver_NULL_create()
-{
+MidiDriver *MidiDriver_NULL_create() {
return new MidiDriver_NULL();
}
Index: quicktime.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/quicktime.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- quicktime.cpp 11 Dec 2002 16:09:54 -0000 1.2
+++ quicktime.cpp 6 Mar 2003 18:26:45 -0000 1.3
@@ -64,13 +64,11 @@
byte _pitchbend_range [16];
};
-MidiDriver_QT::MidiDriver_QT()
-{
+MidiDriver_QT::MidiDriver_QT() {
qtNoteAllocator = NULL;
}
-int MidiDriver_QT::open()
-{
+int MidiDriver_QT::open() {
ComponentResult qtErr = noErr;
int i;
@@ -129,8 +127,7 @@
}
}
-void MidiDriver_QT::send(uint32 b)
-{
+void MidiDriver_QT::send(uint32 b) {
MusicMIDIPacket midPacket;
unsigned char *midiCmd = midPacket.data;
midPacket.length = 3;
@@ -214,7 +211,7 @@
// mysterious reasons the actual factor we have to use is more like 1/32 or 3/64.
// Maybe the QT docs are right, and
_pitchbend[chanID] = ((uint16) midiCmd[1] | (uint16) (midiCmd[2] << 7));
- long theBend = ((long) _pitchbend[chanID] - 0x2000) * _pitchbend_range[chanID] / 32;
+ long theBend = ((long) _pitchbend[chanID] - 0x2000) * _pitchbend_range[chanID] / 32;
NASetController(qtNoteAllocator, qtNoteChannel[chanID], kControllerPitchBend, theBend);
}
@@ -227,8 +224,7 @@
}
}
-void MidiDriver_QT::setPitchBendRange (byte channel, uint range)
-{
+void MidiDriver_QT::setPitchBendRange (byte channel, uint range) {
if (_pitchbend_range[channel] == range)
return;
_pitchbend_range[channel] = range;
@@ -238,8 +234,7 @@
NASetController(qtNoteAllocator, qtNoteChannel[channel], kControllerPitchBend, theBend);
}
-MidiDriver *MidiDriver_QT_create()
-{
+MidiDriver *MidiDriver_QT_create() {
return new MidiDriver_QT();
}
Index: windows.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/windows.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- windows.cpp 10 Jan 2003 14:40:22 -0000 1.5
+++ windows.cpp 6 Mar 2003 18:26:45 -0000 1.6
@@ -49,13 +49,12 @@
void sysEx (byte *msg, uint16 length);
};
-int MidiDriver_WIN::open()
-{
+int MidiDriver_WIN::open() {
if (_isOpen)
return MERR_ALREADY_OPEN;
_streamEvent = CreateEvent (NULL, true, true, NULL);
- MMRESULT res = midiOutOpen((HMIDIOUT *) &_mo, MIDI_MAPPER, (unsigned long) _streamEvent, 0, CALLBACK_EVENT);
+ MMRESULT res = midiOutOpen((HMIDIOUT *)&_mo, MIDI_MAPPER, (unsigned long) _streamEvent, 0, CALLBACK_EVENT);
if (res != MMSYSERR_NOERROR) {
check_error(res);
return MERR_DEVICE_NOT_AVAILABLE;
@@ -65,8 +64,7 @@
return 0;
}
-void MidiDriver_WIN::close()
-{
+void MidiDriver_WIN::close() {
_isOpen = false;
check_error(midiOutClose(_mo));
CloseHandle (_streamEvent);
@@ -100,7 +98,7 @@
midiOutUnprepareHeader (_mo, &_streamHeader, sizeof (_streamHeader));
_streamBuffer [0] = 0xFF;
- memcpy (&_streamBuffer[1], msg, length);
+ memcpy(&_streamBuffer[1], msg, length);
_streamBuffer [length+1] = 0xF7;
_streamHeader.lpData = (char *) _streamBuffer;
@@ -115,17 +113,16 @@
return;
}
- ResetEvent (_streamEvent);
+ ResetEvent(_streamEvent);
result = midiOutLongMsg (_mo, &_streamHeader, sizeof (_streamHeader));
if (result != MMSYSERR_NOERROR) {
- check_error (result);
- SetEvent (_streamEvent);
+ check_error(result);
+ SetEvent(_streamEvent);
return;
}
}
-void MidiDriver_WIN::check_error(MMRESULT result)
-{
+void MidiDriver_WIN::check_error(MMRESULT result) {
char buf[200];
if (result != MMSYSERR_NOERROR) {
midiOutGetErrorText(result, buf, 200);
@@ -133,8 +130,7 @@
}
}
-MidiDriver *MidiDriver_WIN_create()
-{
+MidiDriver *MidiDriver_WIN_create() {
return new MidiDriver_WIN();
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/backends/null null.cpp,1.2,1.3
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/sdl fb2opengl.h,1.6,1.7 sdl-common.cpp,1.33,1.34 sdl-common.h,1.15,1.16 sdl.cpp,1.22,1.23 sdl_gl.cpp,1.20,1.21
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list