Move UIConfiguration Singleton into UIConfiguration header

This removes the direct dependence on ardour_ui.h from 39 files

1 files changed, 2 insertions, 4 deletions

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 441b2dc929..ad16ae148c 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -367,15 +367,13 @@ int main (int argc, char *argv[])
 	}
 #endif
 
-	UIConfiguration* ui_config = new UIConfiguration;
-
-	if (ui_config->pre_gui_init ()) {
+	if (UIConfiguration::instance().pre_gui_init ()) {
 		error << _("Could not complete pre-GUI initialization") << endmsg;
 		exit (1);
 	}
 	
 	try {
-		ui = new ARDOUR_UI (&argc, &argv, localedir.c_str(), ui_config);
+		ui = new ARDOUR_UI (&argc, &argv, localedir.c_str());
 	} catch (failed_constructor& err) {
 		error << string_compose (_("could not create %1 GUI"), PROGRAM_NAME) << endmsg;
 		exit (1);