fix build process to avoid mismatching size/layout of AudioEngine object; use a sligh...

git-svn-id: svn://localhost/ardour2/branches/3.0@6855 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h
index d9f6fa466225e0d06a42ddc87b3fe7e548c6181a..ac521fbd4cb5c61df9d84aab2bcded069f19a847 100644 (file)
--- 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 29659a2d0c181513c2a332f348afa96f7f154298..98484c22de8d5164c60ca73b3769bdc244e18104 100644 (file)
--- 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;