From a431e73ccda3953fc290dbacecd4b2e8ef181676 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 2 Sep 2013 16:41:56 -0400 Subject: replace recently added attempt to use visibility macros with one based on gcc guidelines I can see no reason to define the "C API Call Type", but perhaps it really is needed for some reason. I have tested this on Linux only. --- libs/panners/vbap/vbap.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libs/panners/vbap/vbap.cc') diff --git a/libs/panners/vbap/vbap.cc b/libs/panners/vbap/vbap.cc index 1cef98fc7d..f5cbca79e0 100644 --- a/libs/panners/vbap/vbap.cc +++ b/libs/panners/vbap/vbap.cc @@ -50,7 +50,7 @@ static PanPluginDescriptor _descriptor = { VBAPanner::factory }; -extern "C" { PanPluginDescriptor* panner_descriptor () { return &_descriptor; } } +extern "C" ARDOURPANNER_API PanPluginDescriptor* panner_descriptor () { return &_descriptor; } VBAPanner::Signal::Signal (Session&, VBAPanner&, uint32_t, uint32_t n_speakers) { -- cgit v1.2.3 From 86a39108140a60fda2dffd9d4b378f915c3a47ab Mon Sep 17 00:00:00 2001 From: John Emmas Date: Tue, 3 Sep 2013 14:46:01 +0100 Subject: 'libs/panners' - Use 'alloca()' for a stack based array whose size is unknown (required to be buildable with MSVC) --- libs/panners/vbap/vbap.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'libs/panners/vbap/vbap.cc') diff --git a/libs/panners/vbap/vbap.cc b/libs/panners/vbap/vbap.cc index f5cbca79e0..f1da6a5829 100644 --- a/libs/panners/vbap/vbap.cc +++ b/libs/panners/vbap/vbap.cc @@ -25,6 +25,8 @@ #include #include +#include + #include "pbd/cartesian.h" #include "pbd/compose.h" @@ -290,7 +292,7 @@ VBAPanner::distribute_one (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain_co assert (sz == obufs.count().n_audio()); - int8_t outputs[sz]; // on the stack, no malloc + int8_t *outputs = (int8_t*)alloca(sz); // on the stack, no malloc /* set initial state of each output "record" */ @@ -319,10 +321,10 @@ VBAPanner::distribute_one (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain_co /* at this point, we can test a speaker's status: - (outputs[o] & 1) <= in use before - (outputs[o] & 2) <= in use this time - (outputs[o] & 3) == 3 <= in use both times - outputs[o] == 0 <= not in use either time + (*outputs[o] & 1) <= in use before + (*outputs[o] & 2) <= in use this time + (*outputs[o] & 3) == 3 <= in use both times + *outputs[o] == 0 <= not in use either time */ -- cgit v1.2.3 From 4aa9152e8bbac9002ddfc70f6e46566d35ece1cd Mon Sep 17 00:00:00 2001 From: John Emmas Date: Tue, 3 Sep 2013 14:49:49 +0100 Subject: 'libs/panners' - Fix a typo in 'vbap/vbap.cc' --- libs/panners/vbap/vbap.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libs/panners/vbap/vbap.cc') diff --git a/libs/panners/vbap/vbap.cc b/libs/panners/vbap/vbap.cc index f1da6a5829..68e23d94eb 100644 --- a/libs/panners/vbap/vbap.cc +++ b/libs/panners/vbap/vbap.cc @@ -64,7 +64,7 @@ VBAPanner::Signal::Signal (Session&, VBAPanner&, uint32_t, uint32_t n_speakers) } void -VBAPanner::Signal::Signal::resize_gains (uint32_t n) +VBAPanner::Signal::resize_gains (uint32_t n) { gains.assign (n, 0.0); } -- cgit v1.2.3 From 8216eac044ec392944acd17571a4065cf0365cf2 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 6 Sep 2013 10:55:35 -0400 Subject: fix for unconditional use of #include which doesn't work on OS X alloca() is defined in stdlib on most *nix systems --- libs/panners/vbap/vbap.cc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libs/panners/vbap/vbap.cc') diff --git a/libs/panners/vbap/vbap.cc b/libs/panners/vbap/vbap.cc index 68e23d94eb..6d7496729c 100644 --- a/libs/panners/vbap/vbap.cc +++ b/libs/panners/vbap/vbap.cc @@ -25,7 +25,9 @@ #include #include +#ifdef COMPILER_MSVC #include +#endif #include "pbd/cartesian.h" #include "pbd/compose.h" -- cgit v1.2.3