Add operator<< for bundles.

[ardour.git] / gtk2_ardour / stereo_panner.cc

diff --git a/gtk2_ardour/stereo_panner.cc b/gtk2_ardour/stereo_panner.cc
index 7ab526f8fa8e8deb3c0582ae5d9c43eb3e0e44bf..8442b45e6704e086e82b91c29e0d7d85b46d5d00 100644 (file)
--- 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"
@@ -52,11 +53,13 @@ static const int top_step = 2;
 
 StereoPanner::ColorScheme StereoPanner::colors[3];
 bool StereoPanner::have_colors = false;
-PBD::Signal0<void> StereoPanner::color_change;
 
-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)
@@ -67,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 ();
@@ -78,7 +81,6 @@ StereoPanner::StereoPanner (boost::shared_ptr<PBD::Controllable> position, boost
         position_control->Changed.connect (connections, invalidator(*this), boost::bind (&StereoPanner::value_change, this), gui_context());
         width_control->Changed.connect (connections, invalidator(*this), boost::bind (&StereoPanner::value_change, this), gui_context());
 
-        set_tooltip ();
         set_flags (Gtk::CAN_FOCUS);
 
         add_events (Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK|
@@ -87,7 +89,7 @@ StereoPanner::StereoPanner (boost::shared_ptr<PBD::Controllable> position, boost
                     Gdk::SCROLL_MASK|
                     Gdk::POINTER_MOTION_MASK);
 
-        color_change.connect (connections, invalidator (*this), boost::bind (&DrawingArea::queue_draw, this), gui_context());
+        ColorsChanged.connect (sigc::mem_fun (*this, &StereoPanner::color_handler));
 }
 
 StereoPanner::~StereoPanner ()
@@ -95,21 +97,6 @@ StereoPanner::~StereoPanner ()
         delete drag_data_window;
 }
 
-void
-StereoPanner::set_tooltip ()
-{
-        Gtkmm2ext::UI::instance()->set_tip (this, 
-                                            string_compose (_("0 -> set width to zero (mono)\n%1-uparrow -> set width to 100\n%1-downarrow -> set width to -100"), 
-                                                            
-                                                            Keyboard::secondary_modifier_name()).c_str());
-}
-
-void
-StereoPanner::unset_tooltip ()
-{
-        Gtkmm2ext::UI::instance()->set_tip (this, "");
-}
-
 void
 StereoPanner::set_drag_data ()
 {
@@ -343,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);
                         }
@@ -380,6 +368,7 @@ StereoPanner::on_button_press_event (GdkEventButton* ev)
                 if (ev->y < 20) {
                         /* top section of widget is for position drags */
                         dragging_position = true;
+                        StartPositionGesture ();
                 } else {
                         /* lower section is for dragging width */
                         
@@ -393,11 +382,19 @@ StereoPanner::on_button_press_event (GdkEventButton* ev)
                         const int half_box = lr_box_size/2;
                         
                         if (ev->x >= (left - half_box) && ev->x < (left + half_box)) {
-                                dragging_left = true;
+                                if (swidth < 0.0) {
+                                        dragging_right = true;
+                                } else {
+                                        dragging_left = true;
+                                }
                         } else if (ev->x >= (right - half_box) && ev->x < (right + half_box)) {
-                                dragging_right = true;
+                                if (swidth < 0.0) {
+                                        dragging_left = true;
+                                } else {
+                                        dragging_right = true;
+                                }
                         }
-                        
+                        StartWidthGesture ();
                 }
 
                 dragging = true;
@@ -413,6 +410,8 @@ StereoPanner::on_button_release_event (GdkEventButton* ev)
                 return false;
         }
 
+        bool dp = dragging_position;
+
         dragging = false;
         dragging_position = false;
         dragging_left = false;
@@ -428,10 +427,14 @@ StereoPanner::on_button_release_event (GdkEventButton* ev)
                 /* reset to default */
                 position_control->set_value (0.5);
                 width_control->set_value (1.0);
+        } else {
+                if (dp) {
+                        StopPositionGesture ();
+                } else {
+                        StopWidthGesture ();
+                }
         }
 
-        set_tooltip ();
-
         return true;
 }
 
@@ -500,11 +503,11 @@ StereoPanner::on_motion_notify_event (GdkEventMotion* ev)
                 /* move the window a little away from the mouse */
                 drag_data_window->move (ev->x_root+30, ev->y_root+30);
                 drag_data_window->present ();
-                unset_tooltip ();
         }
 
         int w = get_width();
         double delta = (ev->x - last_drag_x) / (double) w;
+        double current_width = width_control->get_value ();
         
         if (dragging_left) {
                 delta = -delta;
@@ -514,7 +517,6 @@ StereoPanner::on_motion_notify_event (GdkEventMotion* ev)
 
                 /* maintain position as invariant as we change the width */
 
-                double current_width = width_control->get_value ();
 
                 /* create a detent close to the center */
 
@@ -633,16 +635,24 @@ StereoPanner::set_colors ()
         colors[Normal].outline = ARDOUR_UI::config()->canvasvar_StereoPannerOutline.get();
         colors[Normal].text = ARDOUR_UI::config()->canvasvar_StereoPannerText.get();
         colors[Normal].background = ARDOUR_UI::config()->canvasvar_StereoPannerBackground.get();
+        colors[Normal].rule = ARDOUR_UI::config()->canvasvar_StereoPannerRule.get();
 
         colors[Mono].fill = ARDOUR_UI::config()->canvasvar_StereoPannerMonoFill.get();
         colors[Mono].outline = ARDOUR_UI::config()->canvasvar_StereoPannerMonoOutline.get();
         colors[Mono].text = ARDOUR_UI::config()->canvasvar_StereoPannerMonoText.get();
         colors[Mono].background = ARDOUR_UI::config()->canvasvar_StereoPannerMonoBackground.get();
+        colors[Mono].rule = ARDOUR_UI::config()->canvasvar_StereoPannerRule.get();
 
         colors[Inverted].fill = ARDOUR_UI::config()->canvasvar_StereoPannerInvertedFill.get();
         colors[Inverted].outline = ARDOUR_UI::config()->canvasvar_StereoPannerInvertedOutline.get();
         colors[Inverted].text = ARDOUR_UI::config()->canvasvar_StereoPannerInvertedText.get();
         colors[Inverted].background = ARDOUR_UI::config()->canvasvar_StereoPannerInvertedBackground.get();
+        colors[Inverted].rule = ARDOUR_UI::config()->canvasvar_StereoPannerRule.get();
+}
 
-        color_change (); /* EMIT SIGNAL */
+void
+StereoPanner::color_handler ()
+{
+        set_colors ();
+        queue_draw ();
 }