full (?) set of changes required to make MonitorSection an "always-there" component...

[ardour.git] / gtk2_ardour / midi_tracer.h

diff --git a/gtk2_ardour/midi_tracer.h b/gtk2_ardour/midi_tracer.h
index 8a7d8762d969af8a0bc0526a3db740fd591c32ca..83e99ef979bf977d2f2db0ec1105b5dc27440787 100644 (file)
--- a/gtk2_ardour/midi_tracer.h
+++ b/gtk2_ardour/midi_tracer.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Paul Davis 
+    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
@@ -45,19 +45,19 @@ namespace ARDOUR {
 
 class MidiTracer : public ArdourWindow
 {
-  public:
+public:
        MidiTracer ();
        ~MidiTracer();
 
-  private:
+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;
-       struct timeval _last_receipt;
-       
+       MIDI::samplecnt_t _last_receipt;
+
        bool autoscroll;
        bool show_hex;
        bool show_delta_time;
@@ -68,11 +68,11 @@ class MidiTracer : public ArdourWindow
         */
        volatile gint _update_queued;
 
-       RingBuffer<char *> fifo;
+       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;
@@ -91,6 +91,7 @@ class MidiTracer : public ArdourWindow
        void disconnect ();
        PBD::ScopedConnection _parser_connection;
        PBD::ScopedConnection _manager_connection;
+       MIDI::Parser my_parser;
 
        boost::shared_ptr<ARDOUR::MidiPort> traced_port;
 };