i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Patch from Pete Goodeve to add time data to incoming MIDI (#5664)

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36018 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2010-04-01 18:24:53 +00:00
parent 58b0a5dda6
commit a4f52ae465
1 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/midi/PortDrivers.cpp
+23 -13
View File
@@ -98,6 +98,8 @@ MidiPortProducer::GetData()
perror("Error reading data from driver"); perror("Error reading data from driver");
break; break;
} }
bigtime_t timestamp = system_time();
if (haveSysEx) { if (haveSysEx) {
// System Exclusive mode // System Exclusive mode
@@ -111,11 +113,11 @@ MidiPortProducer::GetData()
continue; continue;
} else if ((next & 0xF8) == 0xF8) { } else if ((next & 0xF8) == 0xF8) {
// System Realtime interleaved in System Exclusive sequence // System Realtime interleaved in System Exclusive sequence
SpraySystemRealTime(next); SpraySystemRealTime(next, timestamp);
continue; continue;
} else { } else {
// Whatever byte, this one ends the running SysEx sequence // Whatever byte, this one ends the running SysEx sequence
SpraySystemExclusive(sysexBuf, sysexSize); SpraySystemExclusive(sysexBuf, sysexSize, timestamp);
haveSysEx = false; haveSysEx = false;
if (next == B_SYS_EX_END) { if (next == B_SYS_EX_END) {
// swallow SysEx end byte // swallow SysEx end byte
@@ -128,7 +130,7 @@ MidiPortProducer::GetData()
if ((next & 0xF8) == 0xF8) { if ((next & 0xF8) == 0xF8) {
// System Realtime // System Realtime
SpraySystemRealTime(next); SpraySystemRealTime(next, timestamp);
} else if ((next & 0xF0) == 0xF0) { } else if ((next & 0xF0) == 0xF0) {
// System Common // System Common
runningStatus = 0; runningStatus = 0;
@@ -157,7 +159,7 @@ MidiPortProducer::GetData()
case B_SYS_EX_END: case B_SYS_EX_END:
// Unpaired with B_SYS_EX_START, but pass it anyway... // Unpaired with B_SYS_EX_START, but pass it anyway...
case B_TUNE_REQUEST: case B_TUNE_REQUEST:
SpraySystemCommon(next, 0, 0); SpraySystemCommon(next, 0, 0, timestamp);
break; break;
} }
} else if ((next & 0x80) == 0x80) { } else if ((next & 0x80) == 0x80) {
@@ -187,43 +189,51 @@ MidiPortProducer::GetData()
if (--needed == 0) { if (--needed == 0) {
switch (msgBuf[0] & 0xF0) { switch (msgBuf[0] & 0xF0) {
case B_NOTE_OFF: case B_NOTE_OFF:
SprayNoteOff(msgBuf[0] & 0x0F, msgBuf[1], msgBuf[2]); SprayNoteOff(msgBuf[0] & 0x0F, msgBuf[1], msgBuf[2],
timestamp);
break; break;
case B_NOTE_ON: case B_NOTE_ON:
SprayNoteOn(msgBuf[0] & 0x0F, msgBuf[1], msgBuf[2]); SprayNoteOn(msgBuf[0] & 0x0F, msgBuf[1], msgBuf[2],
timestamp);
break; break;
case B_KEY_PRESSURE: case B_KEY_PRESSURE:
SprayKeyPressure(msgBuf[0] & 0x0F, msgBuf[1], msgBuf[2]); SprayKeyPressure(msgBuf[0] & 0x0F, msgBuf[1], msgBuf[2],
timestamp);
break; break;
case B_CONTROL_CHANGE: case B_CONTROL_CHANGE:
SprayControlChange(msgBuf[0] & 0x0F, msgBuf[1], msgBuf[2]); SprayControlChange(msgBuf[0] & 0x0F, msgBuf[1], msgBuf[2],
timestamp);
break; break;
case B_PROGRAM_CHANGE: case B_PROGRAM_CHANGE:
SprayProgramChange(msgBuf[0] & 0x0F, msgBuf[1]); SprayProgramChange(msgBuf[0] & 0x0F, msgBuf[1],
timestamp);
break; break;
case B_CHANNEL_PRESSURE: case B_CHANNEL_PRESSURE:
SprayChannelPressure(msgBuf[0] & 0x0F, msgBuf[1]); SprayChannelPressure(msgBuf[0] & 0x0F, msgBuf[1],
timestamp);
break; break;
case B_PITCH_BEND: case B_PITCH_BEND:
SprayPitchBend(msgBuf[0] & 0x0F, msgBuf[1], msgBuf[2]); SprayPitchBend(msgBuf[0] & 0x0F, msgBuf[1], msgBuf[2],
timestamp);
break; break;
} }
switch (msgBuf[0]) { switch (msgBuf[0]) {
case B_SONG_POSITION: case B_SONG_POSITION:
SpraySystemCommon(msgBuf[0], msgBuf[1], msgBuf[2]); SpraySystemCommon(msgBuf[0], msgBuf[1], msgBuf[2],
timestamp);
break; break;
case B_MIDI_TIME_CODE: case B_MIDI_TIME_CODE:
case B_SONG_SELECT: case B_SONG_SELECT:
case B_CABLE_MESSAGE: case B_CABLE_MESSAGE:
SpraySystemCommon(msgBuf[0], msgBuf[1], 0); SpraySystemCommon(msgBuf[0], msgBuf[1], 0, timestamp);
break; break;
} }
} }