more changes flowing from a persistent MonitorSection object

[ardour.git] / gtk2_ardour / time_info_box.h

diff --git a/gtk2_ardour/time_info_box.h b/gtk2_ardour/time_info_box.h
index 734f9ebb95492492a922b74ba6a1ca7350ebc894..0ffd00a2bebd12af86e9edcdd20625df41051944 100644 (file)
--- a/gtk2_ardour/time_info_box.h
+++ b/gtk2_ardour/time_info_box.h
@@ -24,55 +24,59 @@
 
 #include <gtkmm/box.h>
 #include <gtkmm/label.h>
+#include <gtkmm/table.h>
 
 #include "ardour/ardour.h"
 #include "ardour/session_handle.h"
 
-class CairoEditableText;
-class CairoCell;
-class CairoTextCell;
+#include "gtkmm2ext/cairo_packer.h"
 
 namespace ARDOUR {
        class Session;
-        class Location;
+       class Location;
 }
 
 class AudioClock;
 
-class TimeInfoBox : public Gtk::Table, public ARDOUR::SessionHandlePtr
+class TimeInfoBox : public CairoHPacker, public ARDOUR::SessionHandlePtr
 {
-  public:
-    TimeInfoBox ();
-    ~TimeInfoBox ();
+public:
+       TimeInfoBox (std::string state_node_name, bool with_punch);
+       ~TimeInfoBox ();
 
-    void set_session (ARDOUR::Session*);
+       void set_session (ARDOUR::Session*);
 
-  protected:
-    bool on_expose_event (GdkEventExpose*);
+private:
+       Gtk::Table table;
 
-  private:
-    AudioClock* selection_start;
-    AudioClock* selection_end;
-    AudioClock* selection_length;
-    
-    AudioClock* punch_start;
-    AudioClock* punch_end;
+       AudioClock* selection_start;
+       AudioClock* selection_end;
+       AudioClock* selection_length;
 
-    Gtk::Label selection_title;
-    Gtk::Label punch_title;
-    bool syncing_selection;
-    bool syncing_punch;
+       AudioClock* punch_start;
+       AudioClock* punch_end;
 
-    void punch_changed (ARDOUR::Location*);
-    void punch_location_changed (ARDOUR::Location*);
-    void watch_punch (ARDOUR::Location*);
-    PBD::ScopedConnectionList punch_connections;
+       Gtk::Label selection_title;
+       Gtk::Label punch_title;
+       bool syncing_selection;
+       bool syncing_punch;
+       bool with_punch_clock;
 
-    void selection_changed ();
+       void punch_changed (ARDOUR::Location*);
+       void punch_location_changed (ARDOUR::Location*);
+       void watch_punch (ARDOUR::Location*);
+       PBD::ScopedConnectionList punch_connections;
+       PBD::ScopedConnectionList editor_connections;
+       PBD::ScopedConnectionList region_property_connections;
 
-    void sync_selection_mode (AudioClock*);
-    void sync_punch_mode (AudioClock*);
-};
+       void selection_changed ();
+       void region_selection_changed ();
+
+       void sync_selection_mode (AudioClock*);
+       void sync_punch_mode (AudioClock*);
 
+       bool clock_button_release_event (GdkEventButton* ev, AudioClock* src);
+       void track_mouse_mode ();
+};
 
 #endif /* __time_info_box_h__ */