X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui_dialogs.cc;h=91ff10d4730aa6c76c2ab0a69f56d3ffc88a5e5c;hb=4b5426eddefd742caa13f9539260ab97bc528a68;hp=f87ce85476438c0612de095b21e066c372ffa87c;hpb=68e943265edf04e63a8e8b8f62bab20f99d9c637;p=ardour.git

diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index f87ce85476..91ff10d473 100644
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -23,14 +23,14 @@
    This is to cut down on the compile times.  It also helps with my sanity.
 */
 
-#include <ardour/session.h>
+#include "ardour/session.h"
 
 #include "actions.h"
 #include "ardour_ui.h"
-#include "connection_editor.h"
 #include "location_ui.h"
 #include "mixer_ui.h"
-#include "option_editor.h"
+#include "rc_option_editor.h"
+#include "session_option_editor.h"
 #include "public_editor.h"
 #include "route_params_ui.h"
 #include "sfdb_ui.h"
@@ -92,10 +92,6 @@ ARDOUR_UI::connect_to_session (Session *s)
 	rec_button.set_sensitive (true);
 	shuttle_box.set_sensitive (true);
 	
-	if (connection_editor) {
-		connection_editor->set_session (s);
-	}
-
 	if (location_ui) {
 		location_ui->set_session(s);
 	}
@@ -104,10 +100,6 @@ ARDOUR_UI::connect_to_session (Session *s)
 		route_params->set_session (s);
 	}
 
-	if (option_editor) {
-		option_editor->set_session (s);
-	}
-
 	setup_session_options ();
 
 	Blink.connect (mem_fun(*this, &ARDOUR_UI::transport_rec_enable_blink));
@@ -146,7 +138,7 @@ ARDOUR_UI::connect_to_session (Session *s)
 
 	/* listen to clock mode changes. don't do this earlier because otherwise as the clocks
 	   restore their modes or are explicitly set, we will cause the "new" mode to be saved
-	   back to the session XML ("extra") state.
+	   back to the session XML ("Extra") state.
 	 */
 
 	AudioClock::ModeChanged.connect (mem_fun (*this, &ARDOUR_UI::store_clock_modes));
@@ -207,10 +199,6 @@ ARDOUR_UI::unload_session (bool hide_stuff)
 	preroll_clock.set_session (0);
 	postroll_clock.set_session (0);
 
-	if (option_editor) {
-		option_editor->set_session (0);
-	}
-
 	delete session;
 	session = 0;
 
@@ -219,79 +207,61 @@ ARDOUR_UI::unload_session (bool hide_stuff)
 	return 0;
 }
 
-int
-ARDOUR_UI::create_connection_editor ()
-{
-#if 0
-	if (connection_editor == 0) {
-		connection_editor = new ConnectionEditor ();
-		connection_editor->signal_unmap().connect (sigc::bind (ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleConnections")));
-	}
-
-	if (session) {
-		connection_editor->set_session (session);
-	}
-#endif
-
-	return 0;
-}
-
 void
-ARDOUR_UI::toggle_connection_editor ()
+ARDOUR_UI::toggle_big_clock_window ()
 {
-	if (create_connection_editor()) {
-		return;
-	}
-
-#if 0
-	RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleConnections"));
+	RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleBigClock"));
 	if (act) {
 		RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic(act);
 	
 		if (tact->get_active()) {
-			connection_editor->show_all ();
-			connection_editor->present ();
+			big_clock_window->show_all ();
+			big_clock_window->present ();
 		} else {
-			connection_editor->hide ();
+			big_clock_window->hide ();
 		} 
 	}
-#endif
 }
 
 void
-ARDOUR_UI::toggle_big_clock_window ()
+ARDOUR_UI::toggle_rc_options_window ()
 {
-	RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleBigClock"));
+	if (rc_option_editor == 0) {
+		rc_option_editor = new RCOptionEditor;
+		rc_option_editor->signal_unmap().connect(sigc::bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleRCOptionsEditor")));
+		rc_option_editor->set_session (session);
+	} 
+
+	RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleRCOptionsEditor"));
 	if (act) {
 		RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic(act);
 	
 		if (tact->get_active()) {
-			big_clock_window->show_all ();
-			big_clock_window->present ();
+			rc_option_editor->show_all ();
+			rc_option_editor->present ();
 		} else {
-			big_clock_window->hide ();
+			rc_option_editor->hide ();
 		} 
 	}
 }
 
 void
-ARDOUR_UI::toggle_options_window ()
+ARDOUR_UI::toggle_session_options_window ()
 {
-	if (option_editor == 0) {
-		option_editor = new OptionEditor (*this, *editor, *mixer);
-		option_editor->signal_unmap().connect(sigc::bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleOptionsEditor")));
-		option_editor->set_session (session);
+	if (session_option_editor == 0) {
+		session_option_editor = new SessionOptionEditor (session);
+		session_option_editor->signal_unmap().connect(sigc::bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleSessionOptionsEditor")));
 	} 
 
-	RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleOptionsEditor"));
+	RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleSessionOptionsEditor"));
 	if (act) {
-		RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic(act);
+		RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic (act);
 	
 		if (tact->get_active()) {
-			option_editor->show_all ();
-			option_editor->present ();
+			session_option_editor->show_all ();
+			session_option_editor->present ();
 		} else {
-			option_editor->hide ();
+			session_option_editor->hide ();
 		} 
 	}
 }
@@ -423,7 +393,7 @@ ARDOUR_UI::toggle_route_params_window ()
 }
 
 void
-ARDOUR_UI::handle_locations_change (Location* ignored)
+ARDOUR_UI::handle_locations_change (Location *)
 {
 	if (session) {
 		if (session->locations()->num_range_markers()) {