X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_tracer.cc;h=70d7c24da654de373386a0bbb59935f14a6e0109;hb=6ee23029a338951705c589be6c61ab52099758b6;hp=357772c91c64735e9b033d4a213f4474b587d0eb;hpb=14fd85af1b57b807aa417044d96b74b257a93283;p=ardour.git

diff --git a/gtk2_ardour/midi_tracer.cc b/gtk2_ardour/midi_tracer.cc
index 357772c91c..70d7c24da6 100644
--- a/gtk2_ardour/midi_tracer.cc
+++ b/gtk2_ardour/midi_tracer.cc
@@ -36,25 +36,31 @@ 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);
@@ -62,11 +68,11 @@ MidiTracer::MidiTracer ()
 	_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");
@@ -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 ();
@@ -155,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:
@@ -383,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 ()
 {