diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-24 12:18:06 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-24 12:18:06 -0400 |
| commit | ee1b49f87e4b8e6406c059f29371892872d3fb85 (patch) | |
| tree | 107f163d9f707c97a0b8179a5f2afd9995d616ec /gtk2_ardour/midi_tracer.cc | |
| parent | 8cd71108c1d153f84f25c3b9e5153a110826c130 (diff) | |
| parent | 1421a34e52862b614f280c751a12893e4abecf88 (diff) | |
fix merge conflicts from master
Diffstat (limited to 'gtk2_ardour/midi_tracer.cc')
| -rw-r--r-- | gtk2_ardour/midi_tracer.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gtk2_ardour/midi_tracer.cc b/gtk2_ardour/midi_tracer.cc index e0deb6dce8..c4fe76252b 100644 --- a/gtk2_ardour/midi_tracer.cc +++ b/gtk2_ardour/midi_tracer.cc @@ -306,8 +306,7 @@ MidiTracer::tracer (Parser&, byte* msg, size_t len) } else if (len == 3 && msg[0] == MIDI::position) { /* MIDI Song Position */ - uint16_t midi_beats = (uint16_t) msg[1]; - midi_beats |= msg[2]; + int midi_beats = (msg[2] << 7) | msg[1]; s += snprintf (&buf[s], bufsize, "%16s %d\n", "Position", (int) midi_beats); } else { |