Call Gio::init from PBD::init instead of ARDOUR::init
PBD needs Gio for PBD::copy_file and perhaps others
This commit is contained in:
parent
55c6d4f2be
commit
1db894f886
@ -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
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user