X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Flocation_ui.h;h=cdbc952e6c11821cbf6bacb727d0a112b3367363;hb=refs%2Ftags%2F5.4;hp=b850b89ddd58189cf7c4fd2197ef24f80f1c4f06;hpb=ae787813ddc37bdc2ba32fb8c190a8153b7c5c59;p=ardour.git

diff --git a/gtk2_ardour/location_ui.h b/gtk2_ardour/location_ui.h
index b850b89ddd..cdbc952e6c 100644
--- a/gtk2_ardour/location_ui.h
+++ b/gtk2_ardour/location_ui.h
@@ -26,7 +26,6 @@
 #include <gtkmm/table.h>
 #include <gtkmm/entry.h>
 #include <gtkmm/label.h>
-#include <gtkmm/paned.h>
 #include <gtkmm/scrolledwindow.h>
 
 #include "pbd/signals.h"
@@ -34,11 +33,13 @@
 #include "ardour/location.h"
 #include "ardour/session_handle.h"
 
+#include <gtkmm2ext/pane.h>
+
+#include "ardour_button.h"
 #include "ardour_window.h"
 #include "audio_clock.h"
 
 namespace ARDOUR {
-	class LocationStack;
 	class Location;
 }
 
@@ -58,6 +59,7 @@ class LocationEditRow  : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	void set_number (int);
 	void focus_name();
         void set_clock_group (ClockGroup&);
+        void unset_clock_group () { _clock_group = 0; }
 
 	sigc::signal<void,ARDOUR::Location*> remove_requested;
 	sigc::signal<void> redraw_ranges;
@@ -80,11 +82,13 @@ class LocationEditRow  : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 
 	Gtk::HBox     start_hbox;
 	AudioClock    start_clock;
-	Gtk::Button   start_to_playhead_button;
+	ArdourButton  start_to_playhead_button;
+	ArdourButton  locate_to_start_button;
 
 	Gtk::HBox     end_hbox;
 	AudioClock    end_clock;
-	Gtk::Button   end_to_playhead_button;
+	ArdourButton  end_to_playhead_button;
+	ArdourButton  locate_to_end_button;
 
 	AudioClock    length_clock;
 	Gtk::CheckButton cd_check_button;
@@ -92,7 +96,7 @@ class LocationEditRow  : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	Gtk::CheckButton lock_check_button;
 	Gtk::CheckButton glue_check_button;
 
-	Gtk::Button   remove_button;
+	ArdourButton   remove_button;
 
 	Gtk::HBox     cd_track_details_hbox;
 	Gtk::Entry    isrc_entry;
@@ -118,6 +122,7 @@ class LocationEditRow  : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	void composer_entry_changed ();
 
 	void to_playhead_button_pressed (LocationPart part);
+	void locate_button_pressed (LocationPart part);
 
 	void clock_changed (LocationPart part);
 	bool locate_to_clock (GdkEventButton*, AudioClock*);
@@ -131,15 +136,16 @@ class LocationEditRow  : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	void scms_toggled ();
 	void preemph_toggled ();
 
-	void end_changed (ARDOUR::Location *);
-	void start_changed (ARDOUR::Location *);
-	void name_changed (ARDOUR::Location *);
-	void location_changed (ARDOUR::Location *);
-	void flags_changed (ARDOUR::Location *, void *src);
-	void lock_changed (ARDOUR::Location *);
-	void position_lock_style_changed (ARDOUR::Location *);
+	void end_changed ();
+	void start_changed ();
+	void name_changed ();
+	void location_changed ();
+	void flags_changed ();
+	void lock_changed ();
+	void position_lock_style_changed ();
 
-	void set_clock_sensitivity ();
+	void set_clock_editable_status ();
+	void show_cd_track_details ();
 
 	PBD::ScopedConnectionList connections;
 };
@@ -161,7 +167,6 @@ class LocationUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	XMLNode & get_state () const;
 
   private:
-	ARDOUR::LocationStack* locations;
 	/** set to the location that has just been created with the LocationUI `add' button
 	    (if Config->get_name_new_markers() is true); if it is non-0, the name entry of
 	    the location is given the focus by location_added().
@@ -174,7 +179,7 @@ class LocationUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	LocationEditRow      punch_edit_row;
 	Gtk::VBox loop_punch_box;
 
-	Gtk::VPaned loc_range_panes;
+	Gtkmm2ext::VPane loc_range_panes;
 
 	Gtk::VBox  loc_frame_box;
 	Gtk::Button add_location_button;
@@ -201,8 +206,7 @@ class LocationUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 
 	void location_removed (ARDOUR::Location *);
 	void location_added (ARDOUR::Location *);
-	void locations_changed (ARDOUR::Locations::Change);
-	void map_locations (ARDOUR::Locations::LocationList&);
+	void map_locations (const ARDOUR::Locations::LocationList&);
 
         ClockGroup* _clock_group;
 	AudioClock::Mode clock_mode_from_session_instant_xml () const;