X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Flocation_ui.h;h=b24865b6cc9936b2e34f62f29d406776f16db903;hb=bc2271b43ee8f301f89ef612e42d81c7b0c992f2;hp=2e9e23617702ae44cf6409827f29b7d448439a8c;hpb=75d265e38871205c2311a3d1b342e69da72b6057;p=ardour.git

diff --git a/gtk2_ardour/location_ui.h b/gtk2_ardour/location_ui.h
index 2e9e236177..b24865b6cc 100644
--- a/gtk2_ardour/location_ui.h
+++ b/gtk2_ardour/location_ui.h
@@ -34,7 +34,7 @@
 #include "ardour/location.h"
 #include "ardour/session_handle.h"
 
-#include "ardour_dialog.h"
+#include "ardour_window.h"
 #include "audio_clock.h"
 
 namespace ARDOUR {
@@ -42,6 +42,8 @@ namespace ARDOUR {
 	class Location;
 }
 
+class ClockGroup;
+
 class LocationEditRow  : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 {
   public:
@@ -55,6 +57,8 @@ 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;
@@ -76,12 +80,12 @@ class LocationEditRow  : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	Gtk::Label    number_label;
 
 	Gtk::HBox     start_hbox;
-	Gtk::Button   start_go_button;
 	AudioClock    start_clock;
+	Gtk::Button   start_to_playhead_button;
 
 	Gtk::HBox     end_hbox;
-	Gtk::Button   end_go_button;
 	AudioClock    end_clock;
+	Gtk::Button   end_to_playhead_button;
 
 	AudioClock    length_clock;
 	Gtk::CheckButton cd_check_button;
@@ -97,11 +101,14 @@ 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::Label         scms_label;
 	Gtk::CheckButton   preemph_check_button;
+	Gtk::Label         preemph_label;
+        ClockGroup* _clock_group;
 
 	guint32 i_am_the_modifier;
 	int   number;
@@ -111,11 +118,10 @@ class LocationEditRow  : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	void performer_entry_changed ();
 	void composer_entry_changed ();
 
-	void set_button_pressed (LocationPart part);
-	void go_button_pressed (LocationPart part);
+	void to_playhead_button_pressed (LocationPart part);
 
 	void clock_changed (LocationPart part);
-	void change_aborted (LocationPart part);
+	bool locate_to_clock (GdkEventButton*, AudioClock*);
 
 	void cd_toggled ();
 	void hide_toggled ();
@@ -126,15 +132,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;
 };
@@ -144,36 +151,38 @@ 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();
 
 	void refresh_location_list ();
 
+	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().
+	*/
 	ARDOUR::Location *newest_location;
 
 	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,17 +203,19 @@ 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;
 };
 
-class LocationUIWindow : public ArdourDialog
+class LocationUIWindow : public ArdourWindow
 {
   public:
 	LocationUIWindow ();
 	~LocationUIWindow ();
 
-	void on_show();
+	void on_map ();
 	void set_session (ARDOUR::Session *);
 
 	LocationUI& ui() { return _ui; }