diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-10 15:03:30 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-10 15:03:30 +0000 |
| commit | 68e943265edf04e63a8e8b8f62bab20f99d9c637 (patch) | |
| tree | ff8941a59662fc0c4622944b65f7b2d5e3bdd0c3 /libs/ardour/globals.cc | |
| parent | e4372df05b7d74a6b80dbbf4b6c00cc2b31c4723 (diff) | |
merge from 2.0-ongoing @ 3581
git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/globals.cc')
| -rw-r--r-- | libs/ardour/globals.cc | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc index 1397a7d959..3401d8c48a 100644 --- a/libs/ardour/globals.cc +++ b/libs/ardour/globals.cc @@ -30,6 +30,10 @@ #include <fst.h> #endif +#ifdef HAVE_AUDIOUNITS +#include <ardour/audio_unit.h> +#endif + #ifdef __SSE__ #include <xmmintrin.h> #endif @@ -347,6 +351,10 @@ ARDOUR::init (bool use_vst, bool try_optimization) } #endif +#ifdef HAVE_AUDIOUNITS + AUPluginInfo::load_cached_info (); +#endif + /* Make VAMP look in our library ahead of anything else */ char *p = getenv ("VAMP_PATH"); @@ -393,11 +401,7 @@ ARDOUR::cleanup () microseconds_t ARDOUR::get_microseconds () { - /* XXX need JACK to export its functionality */ - - struct timeval now; - gettimeofday (&now, 0); - return now.tv_sec * 1000000ULL + now.tv_usec; + return (microseconds_t) jack_get_time (); } ARDOUR::Change @@ -431,7 +435,6 @@ void ARDOUR::find_bindings_files (map<string,string>& files) { vector<sys::path> found; - SearchPath spath = ardour_search_path() + user_config_directory() + system_config_search_path(); if (getenv ("ARDOUR_SAE")) { |