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 e447c59f3b9e461c0d2ba836cdc8917f9e3e001c..c4fe76252b32a1f8b957267d4ec0348d2c9bc0ca 100644 (file)
--- a/gtk2_ardour/midi_tracer.cc
+++ b/gtk2_ardour/midi_tracer.cc
@@ -303,7 +303,11 @@ MidiTracer::tracer (Parser&, byte* msg, size_t len)
                        s += snprintf (
                                &buf[s], bufsize, " MTC full frame to %02d:%02d:%02d:%02d\n", msg[5] & 0x1f, msg[6], msg[7], msg[8]
                                );
+               } else if (len == 3 && msg[0] == MIDI::position) {
 
+                       /* MIDI Song Position */
+                       int midi_beats = (msg[2] << 7) | msg[1];
+                       s += snprintf (&buf[s], bufsize, "%16s %d\n", "Position", (int) midi_beats);
                } else {
 
                        /* other sys-ex */