diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2019-10-20 22:39:09 -0600 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2019-10-24 21:32:46 -0600 |
| commit | 58e8fb7aabf957257ee4f00d15667f1946e8db79 (patch) | |
| tree | 0e24af30997597fea70897ea45cc860532bf3b41 /libs | |
| parent | 3f2f5172915973a98b550c70cabbe979553664b2 (diff) | |
alter ARDOUR::init() API to specify whether a GUI is in control or not
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/ardour.h | 4 | ||||
| -rw-r--r-- | libs/ardour/globals.cc | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h index 0ded815ee3..71d7c4d553 100644 --- a/libs/ardour/ardour/ardour.h +++ b/libs/ardour/ardour/ardour.h @@ -62,10 +62,12 @@ namespace ARDOUR { * @param try_optimization true to enable hardware optimized routines * for mixing, finding peak values etc. * @param localedir Directory to look for localisation files + * @param with_gui set to true if running from a GUI (expected to take + * care of certain initialization itself) * * @return true if Ardour library was successfully initialized */ - LIBARDOUR_API bool init (bool with_vst, bool try_optimization, const char* localedir); + LIBARDOUR_API bool init (bool with_vst, bool try_optimization, const char* localedir, bool with_gui = false); LIBARDOUR_API void init_post_engine (uint32_t); LIBARDOUR_API void cleanup (); LIBARDOUR_API bool no_auto_connect (); diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc index 44d9b22748..9c6aa6ba4a 100644 --- a/libs/ardour/globals.cc +++ b/libs/ardour/globals.cc @@ -164,6 +164,7 @@ PBD::Signal3<bool,std::string,std::string,int> ARDOUR::CopyConfigurationFiles; std::map<std::string, bool> ARDOUR::reserved_io_names; static bool have_old_configuration_files = false; +static bool running_from_gui = false; namespace ARDOUR { extern void setup_enum_writer (); @@ -444,12 +445,14 @@ ARDOUR::handle_old_configuration_files (boost::function<bool (std::string const& } bool -ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir) +ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir, bool with_gui) { if (libardour_initialized) { return true; } + running_from_gui = with_gui; + #ifndef NDEBUG if (getenv("ARDOUR_LUA_METATABLES")) { luabridge::Security::setHideMetatables (false); |