Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / mono_panner.cc

diff --git a/gtk2_ardour/mono_panner.cc b/gtk2_ardour/mono_panner.cc
index 347f5bb57539d2fbe265f1ebf8ab0afd288da766..e136c05153bd7eef3d14585537ad6b16abbcee2a 100644 (file)
--- a/gtk2_ardour/mono_panner.cc
+++ b/gtk2_ardour/mono_panner.cc
@@ -89,9 +89,10 @@ MonoPanner::MonoPanner (boost::shared_ptr<ARDOUR::PannerShell> p)
                have_font = true;
        }
 
-       position_control->Changed.connect (connections, invalidator(*this), boost::bind (&MonoPanner::value_change, this), gui_context());
+       position_control->Changed.connect (panvalue_connections, invalidator(*this), boost::bind (&MonoPanner::value_change, this), gui_context());
 
-       _panner_shell->Changed.connect (connections, invalidator (*this), boost::bind (&MonoPanner::bypass_handler, this), gui_context());
+       _panner_shell->Changed.connect (panshell_connections, invalidator (*this), boost::bind (&MonoPanner::bypass_handler, this), gui_context());
+       _panner_shell->PannableChanged.connect (panshell_connections, invalidator (*this), boost::bind (&MonoPanner::pannable_handler, this), gui_context());
        ColorsChanged.connect (sigc::mem_fun (*this, &MonoPanner::color_handler));
 
        set_tooltip ();
@@ -404,7 +405,7 @@ MonoPanner::on_scroll_event (GdkEventScroll* ev)
        return true;
 }
 
-       bool
+bool
 MonoPanner::on_motion_notify_event (GdkEventMotion* ev)
 {
        if (_panner_shell->bypassed()) {
@@ -444,7 +445,7 @@ MonoPanner::on_motion_notify_event (GdkEventMotion* ev)
        return true;
 }
 
-       bool
+bool
 MonoPanner::on_key_press_event (GdkEventKey* ev)
 {
        double one_degree = 1.0/180.0;
@@ -481,31 +482,41 @@ MonoPanner::on_key_press_event (GdkEventKey* ev)
        return true;
 }
 
-       void
+void
 MonoPanner::set_colors ()
 {
-       colors.fill = ARDOUR_UI::config()->canvasvar_MonoPannerFill.get();
-       colors.outline = ARDOUR_UI::config()->canvasvar_MonoPannerOutline.get();
-       colors.text = ARDOUR_UI::config()->canvasvar_MonoPannerText.get();
-       colors.background = ARDOUR_UI::config()->canvasvar_MonoPannerBackground.get();
-       colors.pos_outline = ARDOUR_UI::config()->canvasvar_MonoPannerPositionOutline.get();
-       colors.pos_fill = ARDOUR_UI::config()->canvasvar_MonoPannerPositionFill.get();
+        colors.fill = ARDOUR_UI::config()->get_canvasvar_MonoPannerFill();
+        colors.outline = ARDOUR_UI::config()->get_canvasvar_MonoPannerOutline();
+        colors.text = ARDOUR_UI::config()->get_canvasvar_MonoPannerText();
+        colors.background = ARDOUR_UI::config()->get_canvasvar_MonoPannerBackground();
+        colors.pos_outline = ARDOUR_UI::config()->get_canvasvar_MonoPannerPositionOutline();
+        colors.pos_fill = ARDOUR_UI::config()->get_canvasvar_MonoPannerPositionFill();
 }
 
-       void
+void
 MonoPanner::color_handler ()
 {
        set_colors ();
        queue_draw ();
 }
 
-       void
+void
 MonoPanner::bypass_handler ()
 {
        queue_draw ();
 }
 
-       PannerEditor*
+void
+MonoPanner::pannable_handler ()
+{
+       panvalue_connections.drop_connections();
+       position_control = _panner->pannable()->pan_azimuth_control;
+       position_binder.set_controllable(position_control);
+       position_control->Changed.connect (panvalue_connections, invalidator(*this), boost::bind (&MonoPanner::value_change, this), gui_context());
+       queue_draw ();
+}
+
+PannerEditor*
 MonoPanner::editor ()
 {
        return new MonoPannerEditor (this);