X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Flocation_ui.h;h=9637257f4991159fb41474325546f4d8b854511f;hb=84e10e93d148e0b81d6a84592855753339b5a617;hp=b2b7174d8f9a9ea26ca9454bbd5ff9db3f1a1d6e;hpb=7c5f1b7a26df60417590340d4cfe367ed00e180a;p=ardour.git

diff --git a/gtk2_ardour/location_ui.h b/gtk2_ardour/location_ui.h
index b2b7174d8f..9637257f49 100644
--- a/gtk2_ardour/location_ui.h
+++ b/gtk2_ardour/location_ui.h
@@ -42,6 +42,8 @@ namespace ARDOUR {
 	class Location;
 }
 
+class ClockGroup;
+
 class LocationEditRow  : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 {
   public:
@@ -55,6 +57,7 @@ class LocationEditRow  : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 
 	void set_number (int);
 	void focus_name();
+        void set_clock_group (ClockGroup&);
 
 	sigc::signal<void,ARDOUR::Location*> remove_requested;
 	sigc::signal<void> redraw_ranges;
@@ -97,11 +100,12 @@ class LocationEditRow  : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 
 
 	Gtk::Label    performer_label;
-	Gtk::Entry  performer_entry;
+	Gtk::Entry    performer_entry;
 	Gtk::Label    composer_label;
- 	Gtk::Entry  composer_entry;
+ 	Gtk::Entry    composer_entry;
 	Gtk::CheckButton   scms_check_button;
 	Gtk::CheckButton   preemph_check_button;
+        ClockGroup* _clock_group;
 
 	guint32 i_am_the_modifier;
 	int   number;
@@ -111,7 +115,7 @@ class LocationEditRow  : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	void performer_entry_changed ();
 	void composer_entry_changed ();
 
-	void set_button_pressed (LocationPart part);
+	void to_playhead_button_pressed (LocationPart part);
 	void go_button_pressed (LocationPart part);
 
 	void clock_changed (LocationPart part);
@@ -134,6 +138,8 @@ class LocationEditRow  : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	void lock_changed (ARDOUR::Location *);
 	void position_lock_style_changed (ARDOUR::Location *);
 
+	void set_clock_sensitivity ();
+
 	PBD::ScopedConnectionList connections;
 };
 
@@ -142,8 +148,9 @@ class LocationUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
   public:
 	LocationUI ();
 	~LocationUI ();
-	
+
 	void set_session (ARDOUR::Session *);
+        void set_clock_mode (AudioClock::Mode);
 
 	void add_new_location();
 	void add_new_range();
@@ -156,22 +163,17 @@ class LocationUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 
 	void session_going_away ();
 
-	Gtk::VBox  location_vpacker;
-
 	LocationEditRow      loop_edit_row;
 	LocationEditRow      punch_edit_row;
 	Gtk::VBox loop_punch_box;
-	Gtk::ScrolledWindow loop_punch_scroller;
 
 	Gtk::VPaned loc_range_panes;
 
-	Gtk::Frame loc_frame;
 	Gtk::VBox  loc_frame_box;
 	Gtk::Button add_location_button;
 	Gtk::ScrolledWindow  location_rows_scroller;
 	Gtk::VBox            location_rows;
 
-	Gtk::Frame range_frame;
 	Gtk::VBox  range_frame_box;
 	Gtk::Button add_range_button;
 	Gtk::ScrolledWindow  range_rows_scroller;
@@ -194,6 +196,8 @@ class LocationUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	void location_added (ARDOUR::Location *);
 	void locations_changed (ARDOUR::Locations::Change);
 	void map_locations (ARDOUR::Locations::LocationList&);
+
+        ClockGroup* _clock_group;
 };
 
 class LocationUIWindow : public ArdourDialog
@@ -202,7 +206,7 @@ class LocationUIWindow : public ArdourDialog
 	LocationUIWindow ();
 	~LocationUIWindow ();
 
-	void on_show();
+	void on_map ();
 	void set_session (ARDOUR::Session *);
 
 	LocationUI& ui() { return _ui; }