ardour/livetrax
13
0
Fork 0
Code

Send and Read MIDI Positions the right way

Browse Source
This commit is contained in:
Michael Fisher 2013-08-02 18:23:36 -05:00 committed by Paul Davis
parent 5e1cfcc7ed
commit 5155a36002
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk2_ardour/midi_tracer.cc
View File

@ -303,8 +303,7 @@ MidiTracer::tracer (Parser&, byte* msg, size_t len)
} else if (len == 3 && msg[0] == MIDI::position) { } else if (len == 3 && msg[0] == MIDI::position) {
/* MIDI Song Position */ /* MIDI Song Position */
uint16_t midi_beats = (uint16_t) msg[1]; int midi_beats = (msg[2] << 7) | msg[1];
midi_beats |= msg[2];
s += snprintf (&buf[s], bufsize, "%16s %d\n", "Position", (int) midi_beats); s += snprintf (&buf[s], bufsize, "%16s %d\n", "Position", (int) midi_beats);
} else { } else {

9
libs/ardour/ticker.cc
View File

@ -386,11 +386,10 @@ MidiClockTicker::send_position_event (uint32_t midi_beats, pframes_t offset)
} }
/* split midi beats into a 14bit value */ /* split midi beats into a 14bit value */
MIDI::byte msg[3] = { MIDI::byte msg[3];
MIDI_CMD_COMMON_SONG_POS, msg[0] = MIDI_CMD_COMMON_SONG_POS;
midi_beats & 0x007f, msg[1] = midi_beats & 0x007f;
midi_beats & 0x3f80 msg[2] = midi_beats >> 7;
};
_midi_port->midimsg (msg, sizeof (msg), offset); _midi_port->midimsg (msg, sizeof (msg), offset);