update CycleTimer to utilize NDEBUG and PBD::DEBUG so that we can leave them in place...

[ardour.git] / gtk2_ardour / location_ui.h

diff --git a/gtk2_ardour/location_ui.h b/gtk2_ardour/location_ui.h
index 84c6fa9fc5b0fb419d63be98c21ab3f1c034085c..9a316bc1edfe24255aed2956c885fc52e045566f 100644 (file)
--- 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 {
@@ -58,7 +58,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;
 
@@ -119,7 +119,6 @@ class LocationEditRow  : public Gtk::HBox, public ARDOUR::SessionHandlePtr
        void go_button_pressed (LocationPart part);
 
        void clock_changed (LocationPart part);
-       void change_aborted (LocationPart part);
 
        void cd_toggled ();
        void hide_toggled ();
@@ -148,7 +147,7 @@ class LocationUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
   public:
        LocationUI ();
        ~LocationUI ();
-       
+
        void set_session (ARDOUR::Session *);
         void set_clock_mode (AudioClock::Mode);
 
@@ -157,6 +156,8 @@ class LocationUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 
        void refresh_location_list ();
 
+       XMLNode & get_state () const;
+
   private:
        ARDOUR::LocationStack* locations;
        ARDOUR::Location *newest_location;
@@ -198,15 +199,16 @@ class LocationUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
        void map_locations (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; }