X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui.h;h=7f16ff7eec265f3bee7c105bd844b642eb9e66c1;hb=1315ee3dff1e4966ab28bd47e81b5f003cac6e40;hp=d0c1e7194a1d117588be78d426858070e8f8da75;hpb=b3fe7cfc892f7d5978ad14eb81e9305fa9c14d13;p=ardour.git

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index d0c1e7194a..7f16ff7eec 100644
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -119,17 +119,11 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 
 	ARDOUR::Session* the_session() { return session; }
 
-	bool will_create_new_session_automatically() const {
-		return _will_create_new_session_automatically;
-	}
-
-	void set_will_create_new_session_automatically (bool yn) {
-		_will_create_new_session_automatically = yn;
-	}
-
-        bool new_session(std::string path = string());
+	bool new_session(std::string path = string());
 	gint cmdline_new_session (string path);
-	int  unload_session ();
+	
+	/// @return true if session was successfully unloaded.
+	bool unload_session ();
 	void close_session(); 
 
 	int  save_state_canfail (string state_name = "");
@@ -137,7 +131,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 	void restore_state (string state_name = "");
 
 	static double gain_to_slider_position (ARDOUR::gain_t g);
-        static ARDOUR::gain_t slider_position_to_gain (double pos);
+	static ARDOUR::gain_t slider_position_to_gain (double pos);
 
 	static ARDOUR_UI *instance () { return theArdourUI; }
 
@@ -156,7 +150,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 	static sigc::signal<void,bool> Blink;
 	static sigc::signal<void>      RapidScreenUpdate;
 	static sigc::signal<void>      SuperRapidScreenUpdate;
-	static sigc::signal<void,nframes_t> Clock;
+	static sigc::signal<void,nframes_t, bool, nframes_t> Clock;
 
 	/* this is a helper function to centralize the (complex) logic for
 	   blinking rec-enable buttons.
@@ -540,8 +534,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 
 	gint session_menu (GdkEventButton *);
 
-	bool _will_create_new_session_automatically;
-
 	NewSessionDialog* new_session_dialog;
 	
 	void open_session ();
@@ -690,6 +682,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 	void toggle_ShowSoloMutes();
 	void toggle_LatchedRecordEnable ();
 	void toggle_RegionEquivalentsOverlap ();
+	void toggle_PrimaryClockDeltaEditCursor ();
+	void toggle_SecondaryClockDeltaEditCursor ();
 
 	void mtc_port_changed ();
 	void map_solo_model ();
@@ -714,6 +708,10 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 
 	void no_memory_warning ();
 	void check_memory_locking ();
+
+	bool ab_direction;
+	void disable_all_plugins ();
+	void ab_all_plugins ();
 };
 
 #endif /* __ardour_gui_h__ */