auditioner always runs at normal speed, independent of transport speed

[ardour.git] / gtk2_ardour / main.cc

diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 83f849185502d108e701c5999f5ba7f7bf789285..65ce3538171563984cadf191f43d3d84fc9954c2 100644 (file)
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -18,10 +18,12 @@
 */
 
 #include <cstdlib>
-#include <signal.h>
 #include <cerrno>
 #include <vector>
 
+#include <signal.h>
+#include <locale.h>
+
 #include <sigc++/bind.h>
 #include <gtkmm/settings.h>
 
@@ -29,6 +31,8 @@
 #include <fftw3.h>
 #endif
 
+#include <curl/curl.h>
+
 #include "pbd/error.h"
 #include "pbd/file_utils.h"
 #include "pbd/textreceiver.h"
@@ -46,8 +50,9 @@
 #include "ardour/filesystem_paths.h"
 
 #include <gtkmm/main.h>
+#include <gtkmm/stock.h>
+
 #include <gtkmm2ext/application.h>
-#include <gtkmm2ext/popup.h>
 #include <gtkmm2ext/utils.h>
 
 #include "ardour_ui.h"
@@ -56,7 +61,7 @@
 #include "enums.h"
 #include "bundle_env.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 #ifdef PLATFORM_WINDOWS
 #include <fcntl.h> // Needed for '_fmode'
@@ -67,6 +72,10 @@
 #include "gtk2ardour-version.h"
 #endif
 
+#ifdef LXVST_SUPPORT
+#include <gdk/gdkx.h>
+#endif
+
 using namespace std;
 using namespace Gtk;
 using namespace ARDOUR_COMMAND_LINE;
@@ -281,6 +290,11 @@ int main (int argc, char *argv[])
 {
        ARDOUR::check_for_old_configuration_files();
 
+       /* global init is not thread safe.*/
+       if (curl_global_init (CURL_GLOBAL_DEFAULT)) {
+               cerr << "curl_global_init() failed. The web is gone. We're all doomed." << endl;
+       }
+
        fixup_bundle_environment (argc, argv, localedir);
 
        load_custom_fonts(); /* needs to happen before any gtk and pango init calls */
@@ -289,12 +303,19 @@ int main (int argc, char *argv[])
                Glib::thread_init();
        }
 
+#ifdef LXVST_SUPPORT
+       XInitThreads ();
+#endif
+
 #ifdef HAVE_FFTW35F
        fftwf_make_planner_thread_safe ();
 #endif
 
 #ifdef ENABLE_NLS
-       gtk_set_locale ();
+       /* initialize C locale to user preference */
+       if (ARDOUR::translations_are_enabled ()) {
+               setlocale (LC_ALL, "");
+       }
 #endif
 
        console_madness_begin();
@@ -364,6 +385,11 @@ int main (int argc, char *argv[])
 
        if (!ARDOUR::init (ARDOUR_COMMAND_LINE::use_vst, ARDOUR_COMMAND_LINE::try_hw_optimization, localedir.c_str())) {
                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"
+                                                         "Run %1 from a commandline for more information."), PROGRAM_NAME),
+                                       false, Gtk::MESSAGE_ERROR , Gtk::BUTTONS_OK, true);
+               msg.run ();
                exit (1);
        }
 
@@ -377,6 +403,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);
@@ -401,8 +429,22 @@ int main (int argc, char *argv[])
        ui = 0;
 
        ARDOUR::cleanup ();
+#ifndef NDEBUG
+       if (getenv ("ARDOUR_RUNNING_UNDER_VALGRIND")) {
+               Glib::usleep(100000);
+               sched_yield();
+       }
+#endif
+
        pthread_cancel_all ();
 
+#ifndef NDEBUG
+       if (getenv ("ARDOUR_RUNNING_UNDER_VALGRIND")) {
+               Glib::usleep(100000);
+               sched_yield();
+       }
+#endif
+
        console_madness_end ();
 
        return 0;