Add test_search_path to find test files in MidnamTest

[ardour.git] / gtk2_ardour / location_ui.h

diff --git a/gtk2_ardour/location_ui.h b/gtk2_ardour/location_ui.h
index 928231cdedeaff78ca2f7c7c0448b047c20656de..76dca563fccad4a62f21801bcdc68f460ce34111 100644 (file)
--- a/gtk2_ardour/location_ui.h
+++ b/gtk2_ardour/location_ui.h
@@ -104,7 +104,9 @@ class LocationEditRow  : public Gtk::HBox, public ARDOUR::SessionHandlePtr
        Gtk::Label    composer_label;
        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;
@@ -129,15 +131,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;
 };
@@ -160,6 +163,10 @@ class LocationUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 
   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 ();
@@ -195,8 +202,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;