cleanup various merge conflict resolution errors/omissions

9 files changed, 52 insertions, 31 deletions

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 76bef4e1eb..645a781782 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -1706,8 +1706,8 @@ ARDOUR_UI::check_audioengine (Gtk::Window& parent)
 {
 	if (!AudioEngine::instance()->connected()) {
 		MessageDialog msg (parent, string_compose (
-					   _("%1 is not connected to any audio backend.\n"
-					     "You cannot open or close sessions in this condition"),
+			                   _("%1 is not connected to any audio backend.\n"
+			                     "You cannot open or close sessions in this condition"),
 					   PROGRAM_NAME));
 		pop_back_splash (msg);
 		msg.run ();
@@ -1719,7 +1719,7 @@ ARDOUR_UI::check_audioengine (Gtk::Window& parent)
 void
 ARDOUR_UI::open_session ()
 {
-	if (!check_audioengine(*editor)) {
+	if (!check_audioengine (_main_window)) {
 		return;
 	}
 
@@ -2773,7 +2773,7 @@ ARDOUR_UI::save_template ()
 {
 	ArdourPrompter prompter (true);
 
-	if (!check_audioengine(*editor)) {
+	if (!check_audioengine (_main_window)) {
 		return;
 	}
 
@@ -3181,7 +3181,7 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
 void
 ARDOUR_UI::close_session()
 {
-	if (!check_audioengine(*editor)) {
+	if (!check_audioengine (_main_window)) {
 		return;
 	}
 
@@ -5353,3 +5353,16 @@ ARDOUR_UI::load_bindings ()
 	}
 }
 
+void
+ARDOUR_UI::cancel_solo ()
+{
+	if (_session) {
+		if (_session->soloing()) {
+			_session->set_solo (_session->get_routes(), false);
+		} else if (_session->listening()) {
+			_session->set_listen (_session->get_routes(), false);
+		}
+
+		_session->clear_all_solo_state (_session->get_routes()); // safeguard, ideally this won't do anything, check the log-window
+	}
+}
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index ace51c79cb..180abfdead 100644
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -145,6 +145,10 @@ namespace Gtk {
 	class ProgressBar;
 }
 
+namespace Gtkmm2ext {
+	class Tabbable;
+}
+
 class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
 {
     public:
diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index 7f75c174eb..ddeebdef83 100644
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -40,6 +40,7 @@
 #include "mixer_ui.h"
 #include "keyboard.h"
 #include "splash.h"
+#include "rc_option_editor.h"
 #include "route_params_ui.h"
 #include "opts.h"
 #include "utils.h"
@@ -104,7 +105,7 @@ ARDOUR_UI::we_have_dependents ()
 	boost::function<void (std::string)> pc (boost::bind (&ARDOUR_UI::parameter_changed, this, _1));
 	Config->map_parameters (pc);
 
-	ARDOUR_UI_UTILS::reset_dpi ();
+	UIConfiguration::instance().reset_dpi ();
 }
 
 void
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index f9978c39fd..57dd0cc935 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -57,6 +57,7 @@
 #include "global_port_matrix.h"
 #include "location_ui.h"
 #include "main_clock.h"
+#include "rc_option_editor.h"
 
 #include <gtkmm2ext/application.h>
 
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index ecececc40c..ed02d6db9f 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -492,11 +492,11 @@ Editor::Editor ()
 	build_snap_type_menu();
 	build_edit_point_menu();
 
-	location_marker_color = ARDOUR_UI::config()->color ("location marker");
-	location_range_color = ARDOUR_UI::config()->color ("location range");
-	location_cd_marker_color = ARDOUR_UI::config()->color ("location cd marker");
-	location_loop_color = ARDOUR_UI::config()->color ("location loop");
-	location_punch_color = ARDOUR_UI::config()->color ("location punch");
+	location_marker_color = UIConfiguration::instance().color ("location marker");
+	location_range_color = UIConfiguration::instance().color ("location range");
+	location_cd_marker_color = UIConfiguration::instance().color ("location cd marker");
+	location_loop_color = UIConfiguration::instance().color ("location loop");
+	location_punch_color = UIConfiguration::instance().color ("location punch");
 
 	timebar_height = std::max(12., ceil (15. * ARDOUR_UI::ui_scale));
 
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index b3668ba194..cd5023916e 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -506,7 +506,7 @@ Editor::maybe_autoscroll (bool allow_horiz, bool allow_vert, bool from_headers)
 		return;
 	}
 	
-	if (!UIConfiguration::instance()->get_autoscroll_editor () || autoscroll_active ()) {
+	if (!UIConfiguration::instance().get_autoscroll_editor () || autoscroll_active ()) {
 		return;
 	}
 
diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc
index 87c0202836..d351e5efba 100644
--- a/gtk2_ardour/plugin_ui.cc
+++ b/gtk2_ardour/plugin_ui.cc
@@ -58,6 +58,7 @@
 #endif
 
 #include "ardour_window.h"
+#include "ardour_ui.h"
 #include "prompter.h"
 #include "plugin_ui.h"
 #include "utils.h"
@@ -361,27 +362,26 @@ PluginUIWindow::on_key_press_event (GdkEventKey* event)
 			}
 		}
 		return true;
-	} else {
-		/* for us to be getting key press events, there really
-		   MUST be a _pluginui, but just to be safe, check ...
-		*/
-
-		if (_pluginui) {
-			_pluginui->grab_focus();
-			if (_pluginui->non_gtk_gui()) {
-				/* pass main window as the window for the event
-				   to be handled in, not this one, because there are
-				   no widgets in this window that we want to have
-				   key focus.
-				*/
-				return relay_key_press (event, &ARDOUR_UI::instance()->main_window());
-			} else {
-				return relay_key_press (event, this);
-			}
+	} 
+	/* for us to be getting key press events, there really
+	   MUST be a _pluginui, but just to be safe, check ...
+	*/
+	
+	if (_pluginui) {
+		_pluginui->grab_focus();
+		if (_pluginui->non_gtk_gui()) {
+			/* pass main window as the window for the event
+			   to be handled in, not this one, because there are
+			   no widgets in this window that we want to have
+			   key focus.
+			*/
+			return relay_key_press (event, &ARDOUR_UI::instance()->main_window());
 		} else {
-			return false;
+			return relay_key_press (event, this);
 		}
-	}
+	} 
+
+	return false;
 }
 
 bool
diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index 5bb68bd6e5..5cbe3163fa 100644
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -54,6 +54,7 @@
 
 #include "ardour_window.h"
 #include "ardour_dialog.h"
+#include "ardour_ui.h"
 #include "gui_thread.h"
 #include "meter_patterns.h"
 #include "midi_tracer.h"
diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc
index 589ec54794..eddae2974e 100644
--- a/gtk2_ardour/utils.cc
+++ b/gtk2_ardour/utils.cc
@@ -54,6 +54,7 @@
 #include "gui_thread.h"
 #include "ui_config.h"
 #include "ardour_dialog.h"
+#include "ardour_ui.h"
 
 using namespace std;
 using namespace Gtk;