X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_info_box.h;h=0ffd00a2bebd12af86e9edcdd20625df41051944;hb=ff5cc4a3115f43443cebfc325d175e3cdddeafed;hp=d0fabae872e31ce2a6b6ce9b9e001416b613f0bf;hpb=ced4378d0914bcfb926267772c45d1d23f3bed38;p=ardour.git

diff --git a/gtk2_ardour/time_info_box.h b/gtk2_ardour/time_info_box.h
index d0fabae872..0ffd00a2be 100644
--- a/gtk2_ardour/time_info_box.h
+++ b/gtk2_ardour/time_info_box.h
@@ -26,63 +26,57 @@
 #include <gtkmm/label.h>
 #include <gtkmm/table.h>
 
-#include "gtkmm2ext/cairo_packer.h"
-
 #include "ardour/ardour.h"
 #include "ardour/session_handle.h"
 
-#include "ardour_button.h"
+#include "gtkmm2ext/cairo_packer.h"
 
 namespace ARDOUR {
 	class Session;
-        class Location;
+	class Location;
 }
 
 class AudioClock;
 
 class TimeInfoBox : public CairoHPacker, public ARDOUR::SessionHandlePtr
 {
-  public:
-    TimeInfoBox ();
-    ~TimeInfoBox ();
-
-    void set_session (ARDOUR::Session*);
-
-  private:
-    Gtk::Table left;
-    Gtk::Table right;
-
-    AudioClock* selection_start;
-    AudioClock* selection_end;
-    AudioClock* selection_length;
-    
-    AudioClock* punch_start;
-    AudioClock* punch_end;
-
-    Gtk::Label selection_title;
-    Gtk::Label punch_title;
-    bool syncing_selection;
-    bool syncing_punch;
-
-    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;
-
-    ArdourButton punch_in_button;
-    ArdourButton punch_out_button;
-
-    void 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 ();
-    void region_property_change (boost::shared_ptr<ARDOUR::Region> r, const PBD::PropertyChange& what_changed);
-};
+public:
+	TimeInfoBox (std::string state_node_name, bool with_punch);
+	~TimeInfoBox ();
+
+	void set_session (ARDOUR::Session*);
+
+private:
+	Gtk::Table table;
+
+	AudioClock* selection_start;
+	AudioClock* selection_end;
+	AudioClock* selection_length;
 
+	AudioClock* punch_start;
+	AudioClock* punch_end;
+
+	Gtk::Label selection_title;
+	Gtk::Label punch_title;
+	bool syncing_selection;
+	bool syncing_punch;
+	bool with_punch_clock;
+
+	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 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__ */