X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Flocation_ui.h;h=2e9e23617702ae44cf6409827f29b7d448439a8c;hb=86244875a40206694c142af8fe1128f28293c467;hp=8f16e2b43ac135a8a4a9a48de4d0276e58e5faa0;hpb=c2c3f3177c6f3642f69f0266360c027e27568f1a;p=ardour.git

diff --git a/gtk2_ardour/location_ui.h b/gtk2_ardour/location_ui.h
index 8f16e2b43a..2e9e236177 100644
--- a/gtk2_ardour/location_ui.h
+++ b/gtk2_ardour/location_ui.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 1999-2002 Paul Davis 
+    Copyright (C) 1999-2002 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_location_ui_h__
@@ -27,20 +26,23 @@
 #include <gtkmm/table.h>
 #include <gtkmm/entry.h>
 #include <gtkmm/label.h>
+#include <gtkmm/paned.h>
+#include <gtkmm/scrolledwindow.h>
 
-#include <ardour/location.h>
-#include <ardour/session.h>
+#include "pbd/signals.h"
+
+#include "ardour/location.h"
+#include "ardour/session_handle.h"
 
 #include "ardour_dialog.h"
-#include "keyboard_target.h"
+#include "audio_clock.h"
 
 namespace ARDOUR {
 	class LocationStack;
-	class Session;
 	class Location;
 }
 
-class LocationEditRow  : public Gtk::HBox
+class LocationEditRow  : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 {
   public:
 	LocationEditRow (ARDOUR::Session *sess=0, ARDOUR::Location *loc=0, int32_t num=-1);
@@ -52,9 +54,10 @@ class LocationEditRow  : public Gtk::HBox
 	void set_session (ARDOUR::Session *);
 
 	void set_number (int);
-	
-	sigc::signal<void,ARDOUR::Location*> remove_requested;  
-	sigc::signal<void> redraw_ranges;  
+	void focus_name();
+
+	sigc::signal<void,ARDOUR::Location*> remove_requested;
+	sigc::signal<void> redraw_ranges;
 
   protected:
 
@@ -65,29 +68,26 @@ class LocationEditRow  : public Gtk::HBox
 	};
 
 	ARDOUR::Location *location;
-	ARDOUR::Session  *session;
 
-	
-	
 	Gtk::Table    item_table;
-	
+
 	Gtk::Entry    name_entry;
 	Gtk::Label    name_label;
 	Gtk::Label    number_label;
-	
+
 	Gtk::HBox     start_hbox;
-	Gtk::Button   start_set_button;
 	Gtk::Button   start_go_button;
 	AudioClock    start_clock;
 
 	Gtk::HBox     end_hbox;
-	Gtk::Button   end_set_button;
 	Gtk::Button   end_go_button;
 	AudioClock    end_clock;
 
 	AudioClock    length_clock;
 	Gtk::CheckButton cd_check_button;
 	Gtk::CheckButton hide_check_button;
+	Gtk::CheckButton lock_check_button;
+	Gtk::CheckButton glue_check_button;
 
 	Gtk::Button   remove_button;
 
@@ -103,68 +103,70 @@ class LocationEditRow  : public Gtk::HBox
 	Gtk::CheckButton   scms_check_button;
 	Gtk::CheckButton   preemph_check_button;
 
-
 	guint32 i_am_the_modifier;
 	int   number;
-	
+
 	void name_entry_changed ();
 	void isrc_entry_changed ();
 	void performer_entry_changed ();
 	void composer_entry_changed ();
-	       
+
 	void set_button_pressed (LocationPart part);
 	void go_button_pressed (LocationPart part);
 
 	void clock_changed (LocationPart part);
+	void change_aborted (LocationPart part);
 
 	void cd_toggled ();
 	void hide_toggled ();
+	void lock_toggled ();
+	void glue_toggled ();
 	void remove_button_pressed ();
 
 	void scms_toggled ();
 	void preemph_toggled ();
 
-	gint entry_focus_event (GdkEventFocus* ev);
-	
 	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);
-	
-	sigc::connection start_changed_connection;
-	sigc::connection end_changed_connection;
-	sigc::connection name_changed_connection;
-	sigc::connection changed_connection;
-	sigc::connection flags_changed_connection;
-	
-};
+	void lock_changed (ARDOUR::Location *);
+	void position_lock_style_changed (ARDOUR::Location *);
+
+	void set_clock_sensitivity ();
 
+	PBD::ScopedConnectionList connections;
+};
 
-class LocationUI : public ArdourDialog
+class LocationUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 {
   public:
 	LocationUI ();
 	~LocationUI ();
-
+	
 	void set_session (ARDOUR::Session *);
 
-  private:
-
+	void add_new_location();
+	void add_new_range();
 
-	ARDOUR::LocationStack          *locations;
+	void refresh_location_list ();
 
-	void session_gone();
+  private:
+	ARDOUR::LocationStack* locations;
+	ARDOUR::Location *newest_location;
 
+	void session_going_away ();
 
 	Gtk::VBox  location_vpacker;
-	Gtk::HBox  location_hpacker;
 
 	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;
@@ -177,7 +179,6 @@ class LocationUI : public ArdourDialog
 	Gtk::ScrolledWindow  range_rows_scroller;
 	Gtk::VBox            range_rows;
 
-
 	/* When any location changes it start
 	   or end points, it sends a signal that is caught
 	   by one of these functions
@@ -188,17 +189,30 @@ class LocationUI : public ArdourDialog
 	void location_redraw_ranges ();
 
 	gint do_location_remove (ARDOUR::Location *);
-	
+
 	guint32 i_am_the_modifier;
 
-	void add_new_location();
-	void add_new_range();
-	
-	void refresh_location_list ();
-	void refresh_location_list_s (ARDOUR::Change);
 	void location_removed (ARDOUR::Location *);
 	void location_added (ARDOUR::Location *);
+	void locations_changed (ARDOUR::Locations::Change);
 	void map_locations (ARDOUR::Locations::LocationList&);
 };
 
+class LocationUIWindow : public ArdourDialog
+{
+  public:
+	LocationUIWindow ();
+	~LocationUIWindow ();
+
+	void on_show();
+	void set_session (ARDOUR::Session *);
+
+	LocationUI& ui() { return _ui; }
+
+  protected:
+	LocationUI _ui;
+	bool on_delete_event (GdkEventAny*);
+	void session_going_away();
+};
+
 #endif // __ardour_location_ui_h__