One fix.

[ardour.git] / gtk2_ardour / midi_tracer.h

diff --git a/gtk2_ardour/midi_tracer.h b/gtk2_ardour/midi_tracer.h
index 278bd037eec5a25e26647592462662905e513e82..e0e3f01dc904afb3bf88d2674f97d2d2c8e16dea 100644 (file)
--- 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,73 @@
 #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&);
+       MidiTracer ();
        ~MidiTracer();
 
   private:
-       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;
-       volatile bool update_queued;
+       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 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;
+
+       boost::shared_ptr<ARDOUR::MidiPort> traced_port;
 };
 
 #endif /* __ardour_gtk_midi_tracer_h__ */