smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 03:36:32 +01:00
Code Issues Projects Releases Wiki Activity

better operation of the stereo panner

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8145 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-12-01 18:27:39 +00:00
parent bce9a0aee7
commit 044a2cca8f
2 changed files with 35 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

16
libs/ardour/panner.cc
View file

@ -1443,18 +1443,20 @@ Panner::set_stereo_pan (double direction_as_lr_fract, double width)
double r_pos = p.azi - (spread/2.0); /* more right is "decreasing degrees" */
bool move_left = true;
bool move_right = true;
int l_index = 0;
int r_index = 1;
assert (_streampanners.size() > 1);
if (width < 0.0) {
swap (l_pos, r_pos);
swap (l_index, r_index);
}
/* if the new right position is less than or equal to 180 (hard left) and the left panner
is already there, we're not moving the left signal.
*/
if (l_pos > 180.0 && _streampanners[0]->get_position().azi == 180.0) {
if (l_pos > 180.0 && _streampanners[l_index]->get_position().azi == 180.0) {
move_left = false;
}
@ -1462,7 +1464,7 @@ Panner::set_stereo_pan (double direction_as_lr_fract, double width)
is already there, we're not moving the right signal.
*/
if (r_pos <= 0.0 && _streampanners[1]->get_position().azi == 0.0) {
if (r_pos <= 0.0 && _streampanners[r_index]->get_position().azi == 0.0) {
move_right = false;
}
@ -1470,8 +1472,10 @@ Panner::set_stereo_pan (double direction_as_lr_fract, double width)
r_pos = max (min (r_pos, 180.0), 0.0);
if (move_left && move_right) {
_streampanners[0]->set_position (AngularVector (l_pos, 0.0));
_streampanners[1]->set_position (AngularVector (r_pos, 0.0));
_streampanners[l_index]->set_position (AngularVector (l_pos, 0.0));
_streampanners[r_index]->set_position (AngularVector (r_pos, 0.0));
cerr << "left @ " << BaseStereoPanner::azimuth_to_lr_fract (l_pos) << " right @ " << BaseStereoPanner::azimuth_to_lr_fract (r_pos) << endl;
}
return move_left && move_right;