X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmain.cc;h=1e84fe541ae64ac0f8ce74a2bc6272115c825b46;hb=a8d62ce056fe260792d4e72bf8cf2fbff0e8b39b;hp=8bcab287883b87982679fa500d9f47a550cfabe7;hpb=4050ca5633dda03679f9aa9fab87d3bbf517395b;p=ardour.git

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 8bcab28788..1e84fe541a 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -35,10 +35,6 @@
 #include <sigc++/bind.h>
 #include <gtkmm/settings.h>
 
-#ifdef HAVE_FFTW35F
-#include <fftw3.h>
-#endif
-
 #include <curl/curl.h>
 
 #include "pbd/error.h"
@@ -315,10 +311,6 @@ int main (int argc, char *argv[])
 	XInitThreads ();
 #endif
 
-#ifdef HAVE_FFTW35F
-	fftwf_make_planner_thread_safe ();
-#endif
-
 #if ENABLE_NLS
 	/* initialize C locale to user preference */
 	if (ARDOUR::translations_are_enabled ()) {
@@ -391,7 +383,7 @@ int main (int argc, char *argv[])
 		     << endl;
 	}
 
-	if (!ARDOUR::init (ARDOUR_COMMAND_LINE::use_vst, ARDOUR_COMMAND_LINE::try_hw_optimization, localedir.c_str())) {
+	if (!ARDOUR::init (ARDOUR_COMMAND_LINE::use_vst, ARDOUR_COMMAND_LINE::try_hw_optimization, localedir.c_str(), true)) {
 		error << string_compose (_("could not initialize %1."), PROGRAM_NAME) << endmsg;
 		Gtk::Main main (argc, argv);
 		Gtk::MessageDialog msg (string_compose (_("Could not initialize %1 (likely due to corrupt config files).\n"