run bundle fixup code for all platforms

[ardour.git] / gtk2_ardour / midi_tracer.h

diff --git a/gtk2_ardour/midi_tracer.h b/gtk2_ardour/midi_tracer.h
index fc6abee15cc472510eba1ff84ee42a57e370564e..b37c4a2351786dd37c522bf8b89d7155534b0604 100644 (file)
--- a/gtk2_ardour/midi_tracer.h
+++ b/gtk2_ardour/midi_tracer.h
@@ -1,15 +1,17 @@
 #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 "pbd/signals.h"
+#include "pbd/ringbuffer.h"
+#include "pbd/pool.h"
 #include "midi++/types.h"
 #include "ardour_dialog.h"
 
@@ -20,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;
@@ -35,21 +37,34 @@ class MidiTracer : public ArdourDialog
        bool autoscroll;
        bool show_hex;
        bool collect;
+       
+       /** 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);
+       void update ();
        
-       Gtk::ToggleButton autoscroll_button;
-       Gtk::ToggleButton base_button;
-       Gtk::ToggleButton collect_button;
+       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::Connection connection;
+       PBD::ScopedConnection _parser_connection;
+       PBD::ScopedConnection _manager_connection;
 };
 
 #endif /* __ardour_gtk_midi_tracer_h__ */