fix merge conflicts from master

[ardour.git] / gtk2_ardour / midi_tracer.cc

diff --git a/gtk2_ardour/midi_tracer.cc b/gtk2_ardour/midi_tracer.cc
index e0deb6dce8da84b973547b5441f4a76db1b1cae5..c4fe76252b32a1f8b957267d4ec0348d2c9bc0ca 100644 (file)
--- 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 {