X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_info_box.h;h=0ffd00a2bebd12af86e9edcdd20625df41051944;hb=3dcb7bf3d3f4eca512c799b5f63fd412e5e3e233;hp=7409d7631e20f21ebbcc3f8e9c5f20f42ef7ee8b;hpb=5b3916c62ec07168b8c554a87241917b06d54fb9;p=ardour.git

diff --git a/gtk2_ardour/time_info_box.h b/gtk2_ardour/time_info_box.h
index 7409d7631e..0ffd00a2be 100644
--- a/gtk2_ardour/time_info_box.h
+++ b/gtk2_ardour/time_info_box.h
@@ -29,57 +29,54 @@
 #include "ardour/ardour.h"
 #include "ardour/session_handle.h"
 
+#include "gtkmm2ext/cairo_packer.h"
+
 namespace ARDOUR {
 	class Session;
-        class Location;
+	class Location;
 }
 
 class AudioClock;
 
-class TimeInfoBox : public Gtk::HBox, public ARDOUR::SessionHandlePtr
+class TimeInfoBox : public CairoHPacker, public ARDOUR::SessionHandlePtr
 {
-  public:
-    TimeInfoBox ();
-    ~TimeInfoBox ();
-
-    void set_session (ARDOUR::Session*);
+public:
+	TimeInfoBox (std::string state_node_name, bool with_punch);
+	~TimeInfoBox ();
 
-  protected:
-    bool on_expose_event (GdkEventExpose*);
+	void set_session (ARDOUR::Session*);
 
-  private:
-    Gtk::Table left;
-    Gtk::Table right;
+private:
+	Gtk::Table table;
 
-    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;
-    PBD::ScopedConnectionList editor_connections;
+	Gtk::Label selection_title;
+	Gtk::Label punch_title;
+	bool syncing_selection;
+	bool syncing_punch;
+	bool with_punch_clock;
 
-    Gtkmm2ext::StatefulToggleButton punch_in_button;
-    Gtkmm2ext::StatefulToggleButton punch_out_button;
+	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 selection_changed ();
+	void selection_changed ();
+	void region_selection_changed ();
 
-    void sync_selection_mode (AudioClock*);
-    void sync_punch_mode (AudioClock*);
+	void sync_selection_mode (AudioClock*);
+	void sync_punch_mode (AudioClock*);
 
-    bool clock_button_release_event (GdkEventButton* ev, AudioClock* src);
-    void track_mouse_mode ();
+	bool clock_button_release_event (GdkEventButton* ev, AudioClock* src);
+	void track_mouse_mode ();
 };
 
-
 #endif /* __time_info_box_h__ */