From 7151d28ae333c66285e2f5f59aa9036cd8f02a06 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sat, 3 Apr 2010 15:53:19 +0000 Subject: [PATCH] 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 --- libs/ardour/ardour/audioengine.h | 5 +++++ libs/ardour/io.cc | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) 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 #include #include #include 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;