X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_tracer.cc;h=70d7c24da654de373386a0bbb59935f14a6e0109;hb=6ee23029a338951705c589be6c61ab52099758b6;hp=e40fbca5909ced28a71d9010aa8fc1e999224ed4;hpb=a15bdfc6d9b42b4078976da54bdd84325cea3d16;p=ardour.git diff --git a/gtk2_ardour/midi_tracer.cc b/gtk2_ardour/midi_tracer.cc index e40fbca590..70d7c24da6 100644 --- a/gtk2_ardour/midi_tracer.cc +++ b/gtk2_ardour/midi_tracer.cc @@ -17,7 +17,6 @@ */ -#define __STDC_FORMAT_MACROS 1 #include #include @@ -37,37 +36,44 @@ using namespace MIDI; using namespace Glib; MidiTracer::MidiTracer () - : ArdourDialog (_("MIDI Tracer")) + : ArdourWindow (_("MIDI Tracer")) , parser (0) , line_count_adjustment (200, 1, 2000, 1, 10) , line_count_spinner (line_count_adjustment) - , line_count_label (_("Store this many lines: ")) + , line_count_label (_("Line history: ")) , autoscroll (true) , show_hex (true) , collect (true) + , show_delta_time (false) , _update_queued (0) , fifo (1024) , buffer_pool ("miditracer", buffer_size, 1024) // 1024 256 byte buffers , autoscroll_button (_("Auto-Scroll")) , base_button (_("Decimal")) , collect_button (_("Enabled")) + , delta_time_button (_("Delta times")) { - get_vbox()->set_spacing (4); - Manager::instance()->PortsChanged.connect (_manager_connection, invalidator (*this), boost::bind (&MidiTracer::ports_changed, this), gui_context()); - + + _last_receipt.tv_sec = 0; + _last_receipt.tv_usec = 0; + + VBox* vbox = manage (new VBox); + vbox->set_spacing (4); + HBox* pbox = manage (new HBox); + pbox->set_spacing (6); pbox->pack_start (*manage (new Label (_("Port:"))), false, false); _port_combo.signal_changed().connect (sigc::mem_fun (*this, &MidiTracer::port_changed)); pbox->pack_start (_port_combo); pbox->show_all (); - get_vbox()->pack_start (*pbox, false, false); - + vbox->pack_start (*pbox, false, false); + scroller.add (text); - get_vbox()->set_border_width (12); - get_vbox()->pack_start (scroller, true, true); - + vbox->set_border_width (12); + vbox->pack_start (scroller, true, true); + text.show (); text.set_name ("MidiTracerTextView"); scroller.show (); @@ -85,19 +91,22 @@ MidiTracer::MidiTracer () line_count_label.show (); line_count_box.show (); - get_action_area()->add (line_count_box); - HBox* bbox = manage (new HBox); + bbox->add (line_count_box); + bbox->add (delta_time_button); bbox->add (base_button); bbox->add (collect_button); bbox->add (autoscroll_button); bbox->show (); - - get_action_area()->add (*bbox); + + vbox->pack_start (*bbox, false, false); + + add (*vbox); base_button.signal_toggled().connect (sigc::mem_fun (*this, &MidiTracer::base_toggle)); collect_button.signal_toggled().connect (sigc::mem_fun (*this, &MidiTracer::collect_toggle)); autoscroll_button.signal_toggled().connect (sigc::mem_fun (*this, &MidiTracer::autoscroll_toggle)); + delta_time_button.signal_toggled().connect (sigc::mem_fun (*this, &MidiTracer::delta_toggle)); base_button.show (); collect_button.show (); @@ -117,9 +126,9 @@ MidiTracer::ports_changed () { string const c = _port_combo.get_active_text (); _port_combo.clear (); - - Manager::PortList const & p = Manager::instance()->get_midi_ports (); - for (Manager::PortList::const_iterator i = p.begin(); i != p.end(); ++i) { + + boost::shared_ptr p = Manager::instance()->get_midi_ports (); + for (Manager::PortList::const_iterator i = p->begin(); i != p->end(); ++i) { _port_combo.append_text ((*i)->name()); } @@ -134,8 +143,7 @@ MidiTracer::port_changed () Port* p = Manager::instance()->port (_port_combo.get_active_text()); if (p) { - Parser* parser = p->input() ? p->input() : p->output(); - parser->any.connect_same_thread (_parser_connection, boost::bind (&MidiTracer::tracer, this, _1, _2, _3)); + p->parser()->any.connect_same_thread (_parser_connection, boost::bind (&MidiTracer::tracer, this, _1, _2, _3)); } } @@ -156,15 +164,24 @@ MidiTracer::tracer (Parser&, byte* msg, size_t len) size_t s; gettimeofday (&tv, 0); - localtime_r (&tv.tv_sec, &now); buf = (char *) buffer_pool.alloc (); bufsize = buffer_size; - s = strftime (buf, bufsize, "%H:%M:%S", &now); - bufsize -= s; - s += snprintf (&buf[s], bufsize, ".%06" PRId64, (int64_t) tv.tv_usec); - bufsize -= s; + if (_last_receipt.tv_sec != 0 && show_delta_time) { + struct timeval delta; + timersub (&tv, &_last_receipt, &delta); + s = snprintf (buf, bufsize, "+%02" PRId64 ":%06" PRId64, (int64_t) delta.tv_sec, (int64_t) delta.tv_usec); + bufsize -= s; + } else { + localtime_r (&tv.tv_sec, &now); + s = strftime (buf, bufsize, "%H:%M:%S", &now); + bufsize -= s; + s += snprintf (&buf[s], bufsize, ".%06" PRId64, (int64_t) tv.tv_usec); + bufsize -= s; + } + + _last_receipt = tv; switch ((eventType) msg[0]&0xf0) { case off: @@ -174,7 +191,7 @@ MidiTracer::tracer (Parser&, byte* msg, size_t len) s += snprintf (&buf[s], bufsize, "%16s chn %2d %-3d %-3d\n", "NoteOff", (msg[0]&0xf)+1, (int) msg[1], (int) msg[2]); } break; - + case on: if (show_hex) { s += snprintf (&buf[s], bufsize, "%16s chn %2d %02x %02x\n", "NoteOn", (msg[0]&0xf)+1, (int) msg[1], (int) msg[2]); @@ -182,7 +199,7 @@ MidiTracer::tracer (Parser&, byte* msg, size_t len) s += snprintf (&buf[s], bufsize, "%16s chn %2d %-3d %-3d\n", "NoteOn", (msg[0]&0xf)+1, (int) msg[1], (int) msg[2]); } break; - + case polypress: if (show_hex) { s += snprintf (&buf[s], bufsize, "%16s chn %2d %02x\n", "PolyPressure", (msg[0]&0xf)+1, (int) msg[1]); @@ -190,7 +207,7 @@ MidiTracer::tracer (Parser&, byte* msg, size_t len) s += snprintf (&buf[s], bufsize, "%16s chn %2d %-3d\n", "PolyPressure", (msg[0]&0xf)+1, (int) msg[1]); } break; - + case MIDI::controller: if (show_hex) { s += snprintf (&buf[s], bufsize, "%16s chn %2d %02x %02x\n", "Controller", (msg[0]&0xf)+1, (int) msg[1], (int) msg[2]); @@ -198,7 +215,7 @@ MidiTracer::tracer (Parser&, byte* msg, size_t len) s += snprintf (&buf[s], bufsize, "%16s chn %2d %2d %-3d\n", "Controller", (msg[0]&0xf)+1, (int) msg[1], (int) msg[2]); } break; - + case program: if (show_hex) { s += snprintf (&buf[s], bufsize, "%16s chn %2d %02x\n", "Program Change", (msg[0]&0xf)+1, (int) msg[1]); @@ -206,7 +223,7 @@ MidiTracer::tracer (Parser&, byte* msg, size_t len) s += snprintf (&buf[s], bufsize, "%16s chn %2d %-3d\n", "Program Change", (msg[0]&0xf)+1, (int) msg[1]); } break; - + case chanpress: if (show_hex) { s += snprintf (&buf[s], bufsize, "%16s chn %2d %02x/%-3d\n", "Channel Pressure", (msg[0]&0xf)+1, (int) msg[1], (int) msg[1]); @@ -214,7 +231,7 @@ MidiTracer::tracer (Parser&, byte* msg, size_t len) s += snprintf (&buf[s], bufsize, "%16s chn %2d %02x/%-3d\n", "Channel Pressure", (msg[0]&0xf)+1, (int) msg[1], (int) msg[1]); } break; - + case MIDI::pitchbend: if (show_hex) { s += snprintf (&buf[s], bufsize, "%16s chn %2d %02x\n", "Pitch Bend", (msg[0]&0xf)+1, (int) msg[1]); @@ -222,7 +239,7 @@ MidiTracer::tracer (Parser&, byte* msg, size_t len) s += snprintf (&buf[s], bufsize, "%16s chn %2d %-3d\n", "Pitch Bend", (msg[0]&0xf)+1, (int) msg[1]); } break; - + case MIDI::sysex: if (len == 1) { switch (msg[0]) { @@ -247,7 +264,7 @@ MidiTracer::tracer (Parser&, byte* msg, size_t len) default: s += snprintf (&buf[s], bufsize, "%16s %02x\n", "Sysex", (int) msg[1]); break; - } + } } else if (len > 5 && msg[0] == 0xf0 && msg[1] == 0x7f && msg[3] == 0x06) { /* MMC */ @@ -276,7 +293,7 @@ MidiTracer::tracer (Parser&, byte* msg, size_t len) s += snprintf (&buf[s], bufsize, " MMC command %02x\n", cmd); } } - + } else if (len == 10 && msg[0] == 0xf0 && msg[1] == 0x7f && msg[9] == 0xf7) { /* MTC full frame */ @@ -285,12 +302,12 @@ MidiTracer::tracer (Parser&, byte* msg, size_t len) ); } else { - + /* other sys-ex */ - + s += snprintf (&buf[s], bufsize, "%16s (%d) = [", "Sysex", (int) len); bufsize -= s; - + for (unsigned int i = 0; i < len && bufsize > 3; ++i) { if (i > 0) { s += snprintf (&buf[s], bufsize, " %02x", msg[i]); @@ -302,39 +319,39 @@ MidiTracer::tracer (Parser&, byte* msg, size_t len) s += snprintf (&buf[s], bufsize, "]\n"); } break; - + case MIDI::song: s += snprintf (&buf[s], bufsize, "%16s\n", "Song"); break; - + case MIDI::tune: s += snprintf (&buf[s], bufsize, "%16s\n", "Tune"); break; - + case MIDI::eox: s += snprintf (&buf[s], bufsize, "%16s\n", "EOX"); break; - + case MIDI::timing: s += snprintf (&buf[s], bufsize, "%16s\n", "Timing"); break; - + case MIDI::start: s += snprintf (&buf[s], bufsize, "%16s\n", "Start"); break; - + case MIDI::stop: s += snprintf (&buf[s], bufsize, "%16s\n", "Stop"); break; - + case MIDI::contineu: s += snprintf (&buf[s], bufsize, "%16s\n", "Continue"); break; - + case active: s += snprintf (&buf[s], bufsize, "%16s\n", "Active Sense"); break; - + default: s += snprintf (&buf[s], bufsize, "%16s\n", "Unknown"); break; @@ -384,6 +401,12 @@ MidiTracer::base_toggle () show_hex = !base_button.get_active(); } +void +MidiTracer::delta_toggle () +{ + show_delta_time = delta_time_button.get_active(); +} + void MidiTracer::collect_toggle () {