From 7884727e78f9e2253b2b6d8ef441fa07272fe950 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 17 Jul 2009 22:12:21 +0000 Subject: massive changes to waf build scripts so that nearly everything "should" be working now except for i18n (OSC is not quite right) ; some preliminary work on post-main-out handling, incomplete; a couple of fixes from -Wall and valgrind git-svn-id: svn://localhost/ardour2/branches/3.0@5371 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/ardour/buffer_set.h | 3 ++- libs/ardour/ardour/delivery.h | 13 ++++++++++--- libs/ardour/ardour/pitch.h | 4 ++++ libs/ardour/ardour/stretch.h | 4 ++++ 4 files changed, 20 insertions(+), 4 deletions(-) (limited to 'libs/ardour/ardour') diff --git a/libs/ardour/ardour/buffer_set.h b/libs/ardour/ardour/buffer_set.h index 1350a3c5ab..1c77918789 100644 --- a/libs/ardour/ardour/buffer_set.h +++ b/libs/ardour/ardour/buffer_set.h @@ -74,6 +74,7 @@ public: void is_silent(bool yn) { _is_silent = yn; } bool is_silent() const { return _is_silent; } void silence (nframes_t nframes, nframes_t offset); + bool is_mirror() const { return _is_mirror; } void set_count(const ChanCount& count) { assert(count <= _available); _count = count; } @@ -169,7 +170,7 @@ private: /// Available counts (number of buffers actually allocated) ChanCount _available; - /// Whether we (don't) 'own' the contained buffers (otherwise we mirror a PortSet) + /// False if we 'own' the contained buffers, if true we mirror a PortSet) bool _is_mirror; /// Whether the buffer set should be considered silent diff --git a/libs/ardour/ardour/delivery.h b/libs/ardour/ardour/delivery.h index e46823d075..5cb11a9348 100644 --- a/libs/ardour/ardour/delivery.h +++ b/libs/ardour/ardour/delivery.h @@ -34,13 +34,20 @@ class Panner; class Delivery : public IOProcessor { public: enum Role { - Insert = 0x1, + /* main outputs - delivers out-of-place to port buffers, and cannot be removed */ + Main = 0x1, + /* send - delivers to port buffers, leaves input buffers untouched */ Send = 0x2, - Listen = 0x4, - Main = 0x8, + /* insert - delivers to port buffers and receives in-place from port buffers */ + Insert = 0x4, + /* listen - internal send used only to deliver to control/monitor bus */ + Listen = 0x8, + /* aux - internal send used to deliver to any bus, by user request */ Aux = 0x10 }; + static bool role_requires_output_ports (Role r) { return r == Main || r == Send || r == Insert; } + /* Delivery to an existing output */ Delivery (Session& s, boost::shared_ptr io, boost::shared_ptr mm, const std::string& name, Role); diff --git a/libs/ardour/ardour/pitch.h b/libs/ardour/ardour/pitch.h index 3173f9ff23..589c370409 100644 --- a/libs/ardour/ardour/pitch.h +++ b/libs/ardour/ardour/pitch.h @@ -20,6 +20,10 @@ #ifndef __ardour_pitch_h__ #define __ardour_pitch_h__ +#ifdef WAF_BUILD +#include "libardour-config.h" +#endif + #include "ardour/filter.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/stretch.h b/libs/ardour/ardour/stretch.h index 0b0de1be57..b878d4794e 100644 --- a/libs/ardour/ardour/stretch.h +++ b/libs/ardour/ardour/stretch.h @@ -20,6 +20,10 @@ #ifndef __ardour_stretch_h__ #define __ardour_stretch_h__ +#ifdef WAF_BUILD +#include "libardour-config.h" +#endif + #include "ardour/filter.h" #ifdef USE_RUBBERBAND -- cgit v1.2.3