projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 1113fce7696c100e98d47c6e20bfefaf20df216c..65ce3538171563984cadf191f43d3d84fc9954c2 100644
(file)
--- a/
gtk2_ardour/main.cc
+++ b/
gtk2_ardour/main.cc
@@
-31,6
+31,8
@@
#include <fftw3.h>
#endif
#include <fftw3.h>
#endif
+#include <curl/curl.h>
+
#include "pbd/error.h"
#include "pbd/file_utils.h"
#include "pbd/textreceiver.h"
#include "pbd/error.h"
#include "pbd/file_utils.h"
#include "pbd/textreceiver.h"
@@
-48,8
+50,9
@@
#include "ardour/filesystem_paths.h"
#include <gtkmm/main.h>
#include "ardour/filesystem_paths.h"
#include <gtkmm/main.h>
+#include <gtkmm/stock.h>
+
#include <gtkmm2ext/application.h>
#include <gtkmm2ext/application.h>
-#include <gtkmm2ext/popup.h>
#include <gtkmm2ext/utils.h>
#include "ardour_ui.h"
#include <gtkmm2ext/utils.h>
#include "ardour_ui.h"
@@
-287,6
+290,11
@@
int main (int argc, char *argv[])
{
ARDOUR::check_for_old_configuration_files();
{
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 */
fixup_bundle_environment (argc, argv, localedir);
load_custom_fonts(); /* needs to happen before any gtk and pango init calls */