X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_tracer.h;h=83e99ef979bf977d2f2db0ec1105b5dc27440787;hb=69194df4d9a2f985423eca7d44c3d3292cc8baad;hp=278bd037eec5a25e26647592462662905e513e82;hpb=b56ad64ee304c53063ddf67f0654ac10738efc68;p=ardour.git

diff --git a/gtk2_ardour/midi_tracer.h b/gtk2_ardour/midi_tracer.h
index 278bd037ee..83e99ef979 100644
--- a/gtk2_ardour/midi_tracer.h
+++ b/gtk2_ardour/midi_tracer.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2012 Paul Davis
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __ardour_gtk_midi_tracer_h__
 #define __ardour_gtk_midi_tracer_h__
 
@@ -7,54 +26,74 @@
 #include <gtkmm/adjustment.h>
 #include <gtkmm/spinbutton.h>
 #include <gtkmm/label.h>
+#include <gtkmm/comboboxtext.h>
+#include <gtkmm/box.h>
 
 #include "pbd/signals.h"
 #include "pbd/ringbuffer.h"
 #include "pbd/pool.h"
 #include "midi++/types.h"
-#include "ardour_dialog.h"
+#include "ardour_window.h"
 
 namespace MIDI {
 	class Parser;
 }
 
-class MidiTracer : public ArdourDialog
+namespace ARDOUR {
+	class MidiPort;
+}
+
+class MidiTracer : public ArdourWindow
 {
-  public:
-	MidiTracer (const std::string&, MIDI::Parser&);
+public:
+	MidiTracer ();
 	~MidiTracer();
 
-  private:
-	MIDI::Parser& parser;
+private:
 	Gtk::TextView text;
 	Gtk::ScrolledWindow scroller;
 	Gtk::Adjustment line_count_adjustment;
 	Gtk::SpinButton line_count_spinner;
 	Gtk::Label line_count_label;
 	Gtk::HBox line_count_box;
+	MIDI::samplecnt_t _last_receipt;
 
 	bool autoscroll;
 	bool show_hex;
-	bool collect;
-	volatile bool update_queued;
-	RingBuffer<char *> fifo;
+	bool show_delta_time;
+
+	/** Incremented when an update is requested, decremented when one is handled; hence
+	 *  equal to 0 when an update is not queued.  May temporarily be negative if a
+	 *  update is handled before it was noted that it had just been queued.
+	 */
+	volatile gint _update_queued;
+
+	PBD::RingBuffer<char *> fifo;
 	Pool buffer_pool;
 	static const size_t buffer_size = 256;
 
-	void tracer (MIDI::Parser&, MIDI::byte*, size_t);
+	void tracer (MIDI::Parser&, MIDI::byte*, size_t, MIDI::samplecnt_t);
 	void update ();
-	
+
 	Gtk::CheckButton autoscroll_button;
 	Gtk::CheckButton base_button;
 	Gtk::CheckButton collect_button;
+	Gtk::CheckButton delta_time_button;
+	Gtk::ComboBoxText _port_combo;
 
 	void base_toggle ();
 	void autoscroll_toggle ();
 	void collect_toggle ();
+	void delta_toggle ();
 
-	void connect ();
+	void port_changed ();
+	void ports_changed ();
 	void disconnect ();
-	PBD::Connection connection;
+	PBD::ScopedConnection _parser_connection;
+	PBD::ScopedConnection _manager_connection;
+	MIDI::Parser my_parser;
+
+	boost::shared_ptr<ARDOUR::MidiPort> traced_port;
 };
 
 #endif /* __ardour_gtk_midi_tracer_h__ */