fix vbap-speaker calculations to work with alloca()

[ardour.git] / libs / panners / vbap / vbap.h

diff --git a/libs/panners/vbap/vbap.h b/libs/panners/vbap/vbap.h
index 7aa136ac78b2789b2bbb9266e7dd5d0625cea541..ee9d4566275e3531593f65824a6e86a0551d56af 100644 (file)
--- a/libs/panners/vbap/vbap.h
+++ b/libs/panners/vbap/vbap.h
@@ -46,6 +46,7 @@ public:
 
         void set_position (double);
         void set_width (double);
+        void set_elevation (double);
 
         std::set<Evoral::Parameter> what_can_be_automated() const;
 
@@ -58,22 +59,24 @@ public:
         std::string describe_parameter (Evoral::Parameter);
         std::string value_as_string (boost::shared_ptr<AutomationControl>) const;
 
-       XMLNode& state (bool full_state);
        XMLNode& get_state ();
-       int set_state (const XMLNode&, int version);
 
         PBD::AngularVector signal_position (uint32_t n) const;
         boost::shared_ptr<Speakers> get_speakers() const;
 
+       void reset ();
+
 private:
         struct Signal {
             PBD::AngularVector direction;
-            double gains[3];
-            double desired_gains[3];
-            int    outputs[3];
-            int    desired_outputs[3];
+            std::vector<double> gains; /* most recently used gain for all speakers */
+
+            int outputs[3];  /* most recent set of outputs used (2 or 3, depending on dimension) */
+            int desired_outputs[3]; /* outputs to use the next time we distribute */
+            double desired_gains[3]; /* target gains for desired_outputs */
 
-            Signal (Session&, VBAPanner&, uint32_t which);
+            Signal (Session&, VBAPanner&, uint32_t which, uint32_t n_speakers);
+            void resize_gains (uint32_t n_speakers);
         };
 
         std::vector<Signal*> _signals;