X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_tracer.h;h=682217be5ba24e830a6d5debfd584dc34be88c47;hb=6ee23029a338951705c589be6c61ab52099758b6;hp=fc6abee15cc472510eba1ff84ee42a57e370564e;hpb=ed6545eb5b360afc1a11f3dec0bb553a11e64436;p=ardour.git

diff --git a/gtk2_ardour/midi_tracer.h b/gtk2_ardour/midi_tracer.h
index fc6abee15c..682217be5b 100644
--- a/gtk2_ardour/midi_tracer.h
+++ b/gtk2_ardour/midi_tracer.h
@@ -1,55 +1,75 @@
 #ifndef __ardour_gtk_midi_tracer_h__
 #define __ardour_gtk_midi_tracer_h__
 
-#include <types.h>
 #include <gtkmm/textview.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/togglebutton.h>
 #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
+class MidiTracer : public ArdourWindow
 {
   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;
 	Gtk::SpinButton line_count_spinner;
 	Gtk::Label line_count_label;
 	Gtk::HBox line_count_box;
-
+	struct timeval _last_receipt;
+	
 	bool autoscroll;
 	bool show_hex;
 	bool collect;
+	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;
+
+	RingBuffer<char *> fifo;
+	Pool buffer_pool;
+	static const size_t buffer_size = 256;
 
 	void tracer (MIDI::Parser&, MIDI::byte*, size_t);
-	void add_string (std::string);
-	
-	Gtk::ToggleButton autoscroll_button;
-	Gtk::ToggleButton base_button;
-	Gtk::ToggleButton collect_button;
+	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;
 };
 
 #endif /* __ardour_gtk_midi_tracer_h__ */