diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2010-04-03 15:53:19 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-04-03 15:53:19 +0000 |
commit | 7151d28ae333c66285e2f5f59aa9036cd8f02a06 (patch) | |
tree | 17cfa41bf45c2bcd362532c644261c86348201db /libs | |
parent | 3104041e67b0f7c476c7478ce4b7a4af3d277da7 (diff) |
fix build process to avoid mismatching size/layout of AudioEngine object; use a slightly more efficient way to access the engine's process_lock from within io.cc
git-svn-id: svn://localhost/ardour2/branches/3.0@6855 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r-- | libs/ardour/ardour/audioengine.h | 5 | ||||
-rw-r--r-- | libs/ardour/io.cc | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h index d9f6fa4662..ac521fbd4c 100644 --- a/libs/ardour/ardour/audioengine.h +++ b/libs/ardour/ardour/audioengine.h @@ -20,6 +20,11 @@ #ifndef __ardour_audioengine_h__ #define __ardour_audioengine_h__ +#ifdef WAF_BUILD +#include "libardour-config.h" +#endif + +#include <iostream> #include <list> #include <set> #include <cmath> diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc index 29659a2d0c..98484c22de 100644 --- a/libs/ardour/io.cc +++ b/libs/ardour/io.cc @@ -59,7 +59,7 @@ extern "C" int isnan (double); extern "C" int isinf (double); #endif -#define BLOCK_PROCESS_CALLBACK() Glib::Mutex::Lock em (_session.engine().process_lock()) +#define BLOCK_PROCESS_CALLBACK() Glib::Mutex::Lock em (AudioEngine::instance()->process_lock()) using namespace std; using namespace ARDOUR; |