diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2011-01-27 01:31:03 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-01-27 01:31:03 +0000 |
commit | 15b5fce90480490455237da917167b0bcb5ce946 (patch) | |
tree | 5c1c5929a83c05db1a901e775fefe4f6cf8dc1b7 /gtk2_ardour/stereo_panner.cc | |
parent | 1385643131a2b2231bbbc0c584c76883fcfb580a (diff) |
merge 3.0-panexp (pan experiments) branch, revisions 8534-8585 into 3.0, thus ending 3.0-panexp. THIS COMMIT WILL BREAK ALL EXISTING 3.0 SESSIONS IN SOME WAY (possibly not fatally).
git-svn-id: svn://localhost/ardour2/branches/3.0@8586 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/stereo_panner.cc')
-rw-r--r-- | gtk2_ardour/stereo_panner.cc | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/gtk2_ardour/stereo_panner.cc b/gtk2_ardour/stereo_panner.cc index 4e715c49ee..8442b45e67 100644 --- a/gtk2_ardour/stereo_panner.cc +++ b/gtk2_ardour/stereo_panner.cc @@ -31,6 +31,7 @@ #include "gtkmm2ext/gtk_ui.h" #include "gtkmm2ext/keyboard.h" +#include "ardour/pannable.h" #include "ardour/panner.h" #include "ardour_ui.h" @@ -53,9 +54,12 @@ static const int top_step = 2; StereoPanner::ColorScheme StereoPanner::colors[3]; bool StereoPanner::have_colors = false; -StereoPanner::StereoPanner (boost::shared_ptr<PBD::Controllable> position, boost::shared_ptr<PBD::Controllable> width) - : position_control (position) - , width_control (width) +using namespace ARDOUR; + +StereoPanner::StereoPanner (boost::shared_ptr<Panner> panner) + : _panner (panner) + , position_control (_panner->pannable()->pan_azimuth_control) + , width_control (_panner->pannable()->pan_width_control) , dragging (false) , dragging_position (false) , dragging_left (false) @@ -66,8 +70,8 @@ StereoPanner::StereoPanner (boost::shared_ptr<PBD::Controllable> position, boost , detented (false) , drag_data_window (0) , drag_data_label (0) - , position_binder (position) - , width_binder (width) + , position_binder (position_control) + , width_binder (width_control) { if (!have_colors) { set_colors (); @@ -326,8 +330,9 @@ StereoPanner::on_button_press_event (GdkEventButton* ev) /* 2ndary-double click on right, collapse to hard right */ width_control->set_value (0); position_control->set_value (1.0); + } else { + position_control->set_value (max_pos); } - position_control->set_value (max_pos); } else { position_control->set_value (0.5); } |