diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2013-08-09 22:13:50 +1000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2013-08-13 20:15:47 +1000 |
| commit | 1db894f8865bfc8eacfccf623f8d8c458bf87fd8 (patch) | |
| tree | a7065d6fd033230d4bbf2ff58d65b021742e6306 /libs | |
| parent | 55c6d4f2be0335a5be7d2773924fade7aaee39b4 (diff) | |
Call Gio::init from PBD::init instead of ARDOUR::init
PBD needs Gio for PBD::copy_file and perhaps others
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/globals.cc | 5 | ||||
| -rw-r--r-- | libs/pbd/pbd.cc | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc index 0941b72de8..986d320aef 100644 --- a/libs/ardour/globals.cc +++ b/libs/ardour/globals.cc @@ -50,8 +50,6 @@ #undef check /* stupid Apple and their un-namespaced, generic Carbon macros */ #endif -#include <giomm.h> - #include <glibmm/fileutils.h> #include <glibmm/miscutils.h> @@ -227,9 +225,6 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir if (!PBD::init()) return false; - // this really should be in PBD::init..if there was one - Gio::init (); - #ifdef ENABLE_NLS (void) bindtextdomain(PACKAGE, localedir); #endif diff --git a/libs/pbd/pbd.cc b/libs/pbd/pbd.cc index 58c8440a0f..dd33f3103b 100644 --- a/libs/pbd/pbd.cc +++ b/libs/pbd/pbd.cc @@ -20,6 +20,8 @@ #include <iostream> #include <cstdlib> +#include <giomm.h> + #include <glibmm/thread.h> #include "pbd/pbd.h" @@ -46,6 +48,8 @@ PBD::init () Glib::thread_init(); } + Gio::init (); + PBD::ID::init (); libpbd_initialized = true; |