, _speakers (new VBAPSpeakers (s))
{
_pannable->pan_azimuth_control->Changed.connect_same_thread (*this, boost::bind (&VBAPanner::update, this));
+ _pannable->pan_elevation_control->Changed.connect_same_thread (*this, boost::bind (&VBAPanner::update, this));
_pannable->pan_width_control->Changed.connect_same_thread (*this, boost::bind (&VBAPanner::update, this));
+ if (!_pannable->has_state()) {
+ reset();
+ }
update ();
}
void
VBAPanner::update ()
{
- /* recompute signal directions based on panner azimuth and, if relevant, width (diffusion) parameters)
- */
-
- /* panner azimuth control is [0 .. 1.0] which we interpret as [0 .. 360] degrees
- */
- double center = _pannable->pan_azimuth_control->get_value() * 360.0;
+ /* recompute signal directions based on panner azimuth and, if relevant, width (diffusion) and elevation parameters */
+ double elevation = _pannable->pan_elevation_control->get_value() * 90.0;
if (_signals.size() > 1) {
-
- /* panner width control is [-1.0 .. 1.0]; we ignore sign, and map to [0 .. 360] degrees
- so that a width of 1 corresponds to a signal equally present from all directions,
- and a width of zero corresponds to a point source from the "center" (above) point
- on the perimeter of the speaker array.
- */
-
- double w = fabs (_pannable->pan_width_control->get_value()) * 360.0;
-
- double min_dir = center - (w/2.0);
- if (min_dir < 0) {
- min_dir = 360.0 + min_dir; // its already negative
- }
- min_dir = max (min (min_dir, 360.0), 0.0);
+ double w = - (_pannable->pan_width_control->get_value());
+ double signal_direction = 1.0 - (_pannable->pan_azimuth_control->get_value() + (w/2));
+ double grd_step_per_signal = w / (_signals.size() - 1);
+ for (vector<Signal*>::iterator s = _signals.begin(); s != _signals.end(); ++s) {
- double max_dir = center + (w/2.0);
- if (max_dir > 360.0) {
- max_dir = max_dir - 360.0;
- }
- max_dir = max (min (max_dir, 360.0), 0.0);
-
- if (max_dir < min_dir) {
- swap (max_dir, min_dir);
- }
-
- double degree_step_per_signal = (max_dir - min_dir) / (_signals.size() - 1);
- double signal_direction = min_dir;
+ Signal* signal = *s;
- if (w >= 0.0) {
-
- /* positive width - normal order of signal spread */
-
- for (vector<Signal*>::iterator s = _signals.begin(); s != _signals.end(); ++s) {
-
- Signal* signal = *s;
-
- signal->direction = AngularVector (signal_direction, 0.0);
- compute_gains (signal->desired_gains, signal->desired_outputs, signal->direction.azi, signal->direction.ele);
- signal_direction += degree_step_per_signal;
- }
- } else {
+ int over = signal_direction;
+ over -= (signal_direction >= 0) ? 0 : 1;
+ signal_direction -= (double)over;
- /* inverted width - reverse order of signal spread */
-
- for (vector<Signal*>::reverse_iterator s = _signals.rbegin(); s != _signals.rend(); ++s) {
-
- Signal* signal = *s;
-
- signal->direction = AngularVector (signal_direction, 0.0);
- compute_gains (signal->desired_gains, signal->desired_outputs, signal->direction.azi, signal->direction.ele);
- signal_direction += degree_step_per_signal;
- }
+ signal->direction = AngularVector (signal_direction * 360.0, elevation);
+ compute_gains (signal->desired_gains, signal->desired_outputs, signal->direction.azi, signal->direction.ele);
+ signal_direction += grd_step_per_signal;
}
-
} else if (_signals.size() == 1) {
+ double center = (1.0 - _pannable->pan_azimuth_control->get_value()) * 360.0;
/* width has no role to play if there is only 1 signal: VBAP does not do "diffusion" of a single channel */
Signal* s = _signals.front();
- s->direction = AngularVector (center, 0);
+ s->direction = AngularVector (center, elevation);
compute_gains (s->desired_gains, s->desired_outputs, s->direction.azi, s->direction.ele);
}
+
+ SignalPositionChanged(); /* emit */
}
void
if (_signals.size() > 1) {
s.insert (Evoral::Parameter (PanWidthAutomation));
}
+ if (_speakers->dimension() == 3) {
+ s.insert (Evoral::Parameter (PanElevationAutomation));
+ }
return s;
}
return _("Direction");
case PanWidthAutomation:
return _("Diffusion");
+ case PanElevationAutomation:
+ return _("Elevation");
default:
return _pannable->describe_parameter (p);
}
switch (ac->parameter().type()) {
case PanAzimuthAutomation: /* direction */
- return string_compose (_("%1"), int (rint (val * 360.0)));
+ return string_compose (_("%1\u00B0"), (int (rint (val * 360.0))+180)%360);
case PanWidthAutomation: /* diffusion */
return string_compose (_("%1%%"), (int) floor (100.0 * fabs(val)));
+
+ case PanElevationAutomation: /* elevation */
+ return string_compose (_("%1\u00B0"), (int) floor (90.0 * fabs(val)));
default:
- return _pannable->value_as_string (ac);
+ return _("unused");
}
}
void
VBAPanner::set_position (double p)
{
- if (p < 0.0) {
- p = 1.0 + p;
- }
-
- if (p > 1.0) {
- p = fmod (p, 1.0);
- }
-
- _pannable->pan_azimuth_control->set_value (p);
+ /* map into 0..1 range */
+ int over = p;
+ over -= (p >= 0) ? 0 : 1;
+ p -= (double)over;
+ _pannable->pan_azimuth_control->set_value (p);
}
void
_pannable->pan_width_control->set_value (min (1.0, max (-1.0, w)));
}
+void
+VBAPanner::set_elevation (double e)
+{
+ _pannable->pan_elevation_control->set_value (min (1.0, max (0.0, e)));
+}
+
void
VBAPanner::reset ()
{
- set_position (0);
- set_width (1);
+ set_position (.5);
+ if (_signals.size() > 1) {
+ set_width (1.0 - (1.0 / (double)_signals.size()));
+ } else {
+ set_width (1.0);
+ }
+ set_elevation (0);
update ();
}
projects / ardour.git / blobdiff