X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstartup.cc;h=12f98916bf30188048617390943b32bebd83cf7f;hb=25ec63968c0e792217a015c402ac52ae59a85e3b;hp=f3e1808a9c4487057ea4cae224d7c3b86d41ba54;hpb=03163154a2a909d3f41f4a0edb88b0ad640dad97;p=ardour.git

diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc
index f3e1808a9c..12f98916bf 100644
--- a/gtk2_ardour/startup.cc
+++ b/gtk2_ardour/startup.cc
@@ -22,11 +22,10 @@
 #include "gtk2ardour-version.h"
 #endif
 
-#include <fstream>
 #include <algorithm>
 #include <fcntl.h>
 
-#include <glib/gstdio.h>
+#include "pbd/gstdio_compat.h"
 
 #include <gtkmm/main.h>
 #include <gtkmm/filechooser.h>
@@ -47,12 +46,12 @@
 #include "ardour/session.h"
 #include "ardour/session_state_utils.h"
 #include "ardour/template_utils.h"
+#include "ardour/profile.h"
 
-#include "ardour_ui.h"
 #include "startup.h"
 #include "opts.h"
 #include "engine_dialog.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include "utils.h"
 
 using namespace std;
@@ -80,30 +79,30 @@ ArdourStartup::ArdourStartup ()
 {
 	set_position (WIN_POS_CENTER);
 	set_border_width (12);
-	
-	if ((icon_pixbuf = ::get_icon ("ardour_icon_48px")) == 0) {
+
+	if (! (icon_pixbuf = ::get_icon (PROGRAM_NAME "-icon_48px"))) {
 		throw failed_constructor();
 	}
-	
+
 	list<Glib::RefPtr<Gdk::Pixbuf> > window_icons;
 	Glib::RefPtr<Gdk::Pixbuf> icon;
-	
-	if ((icon = ::get_icon ("ardour_icon_16px")) != 0) {
+
+	if ((icon = ::get_icon (PROGRAM_NAME "-icon_16px"))) {
 		window_icons.push_back (icon);
 	}
-	if ((icon = ::get_icon ("ardour_icon_22px")) != 0) {
+	if ((icon = ::get_icon (PROGRAM_NAME "-icon_22px"))) {
 		window_icons.push_back (icon);
 	}
-	if ((icon = ::get_icon ("ardour_icon_32px")) != 0) {
+	if ((icon = ::get_icon (PROGRAM_NAME "-icon_32px"))) {
 		window_icons.push_back (icon);
 	}
-	if ((icon = ::get_icon ("ardour_icon_48px")) != 0) {
+	if ((icon = ::get_icon (PROGRAM_NAME "-icon_48px"))) {
 		window_icons.push_back (icon);
 	}
 	if (!window_icons.empty ()) {
 		set_default_icon_list (window_icons);
 	}
-	
+
 	setup_new_user_page ();
 	setup_first_time_config_page ();
 	setup_monitoring_choice_page ();
@@ -125,7 +124,7 @@ ArdourStartup::required ()
 	 */
 
 	const int current_version = atoi (PROGRAM_VERSION);
-	
+
 	for (int v = current_version; v != 0; --v) {
 		if (Glib::file_test (ARDOUR::been_here_before_path (v), Glib::FILE_TEST_EXISTS)) {
 			if (v != current_version) {
@@ -180,7 +179,7 @@ ArdourStartup::default_dir_changed ()
 {
 	Config->set_default_session_parent_dir (default_dir_chooser->get_filename());
 	// make new session folder chooser point to the new default
-	new_folder_chooser.set_current_folder (Config->get_default_session_parent_dir());	
+	new_folder_chooser.set_current_folder (Config->get_default_session_parent_dir());
 	config_changed ();
 }
 
@@ -359,7 +358,9 @@ ArdourStartup::setup_final_page ()
 
 	VBox* vbox = manage (new VBox);
 	vbox->pack_start (*final_label, true, true);
-	vbox->pack_start (plugin_disco_button, true, false);
+	if (!Profile->get_mixbus()) {
+		vbox->pack_start (plugin_disco_button, true, false);
+	}
 	vbox->show ();
 
 	final_page_index = append_page (*vbox);
@@ -425,7 +426,7 @@ ArdourStartup::on_apply ()
 		PBD::ScopedFileDescriptor fout (g_open (been_here_before_path ().c_str(), O_CREAT|O_TRUNC|O_RDWR, 0666));
 
 	}
-		
+
 	_response = RESPONSE_OK;
 	gtk_main_quit ();
 }