when clearing route solo state, do the required update

[ardour.git] / gtk2_ardour / main.cc

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index b40490daa1a9b40d746aa46ce3506700d982ff29..a123631a54cc0f2b3219b919e67f2f8767a49e9e 100644 (file)
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -18,14 +18,19 @@
 */
 
 #include <cstdlib>
-#include <signal.h>
 #include <cerrno>
-#include <fstream>
 #include <vector>
 
+#include <signal.h>
+#include <locale.h>
+
 #include <sigc++/bind.h>
 #include <gtkmm/settings.h>
 
+#ifdef HAVE_FFTW35F
+#include <fftw3.h>
+#endif
+
 #include "pbd/error.h"
 #include "pbd/file_utils.h"
 #include "pbd/textreceiver.h"
@@ -53,7 +58,7 @@
 #include "enums.h"
 #include "bundle_env.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #ifdef PLATFORM_WINDOWS
 #include <fcntl.h> // Needed for '_fmode'
@@ -270,6 +275,8 @@ extern "C" {
 
 int ardour_main (int argc, char *argv[])
 
+#elif defined NOMAIN
+int nomain (int argc, char *argv[])
 #else
 int main (int argc, char *argv[])
 #endif
@@ -284,8 +291,18 @@ int main (int argc, char *argv[])
                Glib::thread_init();
        }
 
+#ifdef HAVE_FFTW35F
+       fftwf_make_planner_thread_safe ();
+#endif
+
 #ifdef ENABLE_NLS
-       gtk_set_locale ();
+       /* initialize C and C++ locales to user preference */
+       setlocale (LC_ALL, "");
+       try {
+               std::locale::global (std::locale (setlocale (LC_ALL, 0)));
+       } catch (...) {
+               std::cerr << "Cannot set C++ locale\n";
+       }
 #endif
 
        console_madness_begin();
@@ -368,6 +385,8 @@ int main (int argc, char *argv[])
        }
 #endif
 
+       DEBUG_TRACE (DEBUG::Locale, string_compose ("main() locale '%1'\n", setlocale (LC_NUMERIC, NULL)));
+
        if (UIConfiguration::instance().pre_gui_init ()) {
                error << _("Could not complete pre-GUI initialization") << endmsg;
                exit (1);