X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_tracer.h;h=8383b616a0d3b36cc5edf713c561152aef73f9d2;hb=ccc5467bcaef73fdabafc5c4b01e8762798f9ac2;hp=47f173824345ed9cb791b7cfed5ffa018e2fd77b;hpb=a48742043be3ecc3d0522ae48ff4401665d7e83f;p=ardour.git

diff --git a/gtk2_ardour/midi_tracer.h b/gtk2_ardour/midi_tracer.h
index 47f1738243..8383b616a0 100644
--- a/gtk2_ardour/midi_tracer.h
+++ b/gtk2_ardour/midi_tracer.h
@@ -7,6 +7,7 @@
 #include <gtkmm/adjustment.h>
 #include <gtkmm/spinbutton.h>
 #include <gtkmm/label.h>
+#include <gtkmm/comboboxtext.h>
 
 #include "pbd/signals.h"
 #include "pbd/ringbuffer.h"
@@ -21,11 +22,11 @@ namespace MIDI {
 class MidiTracer : public ArdourDialog
 {
   public:
-	MidiTracer (const std::string&, MIDI::Parser&);
+	MidiTracer ();
 	~MidiTracer();
 
   private:
-	MIDI::Parser& parser;
+	MIDI::Parser* parser;
 	Gtk::TextView text;
 	Gtk::ScrolledWindow scroller;
 	Gtk::Adjustment line_count_adjustment;
@@ -36,25 +37,34 @@ class MidiTracer : public ArdourDialog
 	bool autoscroll;
 	bool show_hex;
 	bool collect;
-	volatile bool update_queued;
+
+	/** 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;
+
 	RingBuffer<char *> fifo;
 	Pool buffer_pool;
 	static const size_t buffer_size = 256;
 
 	void tracer (MIDI::Parser&, MIDI::byte*, size_t);
 	void update ();
-	
+
 	Gtk::CheckButton autoscroll_button;
 	Gtk::CheckButton base_button;
 	Gtk::CheckButton collect_button;
+	Gtk::ComboBoxText _port_combo;
 
 	void base_toggle ();
 	void autoscroll_toggle ();
 	void collect_toggle ();
 
-	void connect ();
+	void port_changed ();
+	void ports_changed ();
 	void disconnect ();
-	PBD::ScopedConnection connection;
+	PBD::ScopedConnection _parser_connection;
+	PBD::ScopedConnection _manager_connection;
 };
 
 #endif /* __ardour_gtk_midi_tracer_h__ */