projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
use new action map API instead of ActionManager::get_action
[ardour.git] / gtk2_ardour / stereo_panner.cc
diff --git a/gtk2_ardour/stereo_panner.cc b/gtk2_ardour/stereo_panner.cc
index 0736a426c15d58a6f4df86b3739ee4041c5d34fd..e5b91d39781ca738cb337e81e3c0285134b868ec 100644 (file)
--- a/gtk2_ardour/stereo_panner.cc
+++ b/gtk2_ardour/stereo_panner.cc
@@ -24,7 +24,6 @@
 #include <gtkmm/window.h>
 #include <pangomm/layout.h>
 
-#include "pbd/controllable.h"
 #include "pbd/compose.h"
 
 #include "gtkmm2ext/gui_thread.h"
@@ -37,7 +36,7 @@
 #include "ardour/panner.h"
 #include "ardour/panner_shell.h"
 
-#include "canvas/colors.h"
+#include "gtkmm2ext/colors.h"
 
 #include "stereo_panner.h"
 #include "stereo_panner_editor.h"
@@ -45,13 +44,15 @@
 #include "utils.h"
 #include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace ARDOUR_UI_UTILS;
 
+using PBD::Controllable;
+
 StereoPanner::ColorScheme StereoPanner::colors[3];
 bool StereoPanner::have_colors = false;
 
@@ -306,7 +307,7 @@ StereoPanner::on_button_press_event (GdkEventButton* ev)
        if (_panner_shell->bypassed()) {
                return true;
        }
-       
+
        drag_start_x = ev->x;
        last_drag_x = ev->x;
 
@@ -355,21 +356,21 @@ StereoPanner::on_button_press_event (GdkEventButton* ev)
                                /* left side dbl click */
                                if (Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier)) {
                                        /* 2ndary-double click on left, collapse to hard left */
-                                       width_control->set_value (0);
-                                       position_control->set_value (0);
+                                       width_control->set_value (0, Controllable::NoGroup);
+                                       position_control->set_value (0, Controllable::NoGroup);
                                } else {
-                                       position_control->set_value (min_pos);
+                                       position_control->set_value (min_pos, Controllable::NoGroup);
                                }
                        } else if (ev->x > 2*width/3) {
                                if (Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier)) {
                                        /* 2ndary-double click on right, collapse to hard right */
-                                       width_control->set_value (0);
-                                       position_control->set_value (1.0);
+                                       width_control->set_value (0, Controllable::NoGroup);
+                                       position_control->set_value (1.0, Controllable::NoGroup);
                                } else {
-                                       position_control->set_value (max_pos);
+                                       position_control->set_value (max_pos, Controllable::NoGroup);
                                }
                        } else {
-                               position_control->set_value (0.5);
+                               position_control->set_value (0.5, Controllable::NoGroup);
                        }
 
                } else {
@@ -381,13 +382,13 @@ StereoPanner::on_button_press_event (GdkEventButton* ev)
 
                        if (ev->x <= width/3) {
                                /* left side dbl click */
-                               width_control->set_value (max_width); // reset width to 100%
+                               width_control->set_value (max_width, Controllable::NoGroup); // reset width to 100%
                        } else if (ev->x > 2*width/3) {
                                /* right side dbl click */
-                               width_control->set_value (-max_width); // reset width to inverted 100%
+                               width_control->set_value (-max_width, Controllable::NoGroup); // reset width to inverted 100%
                        } else {
                                /* center dbl click */
-                               width_control->set_value (0); // collapse width to 0%
+                               width_control->set_value (0, Controllable::NoGroup); // collapse width to 0%
                        }
                }
 
@@ -447,7 +448,7 @@ StereoPanner::on_button_release_event (GdkEventButton* ev)
        if (PannerInterface::on_button_release_event (ev)) {
                return true;
        }
-       
+
        if (ev->button != 1) {
                return false;
        }
@@ -500,19 +501,19 @@ StereoPanner::on_scroll_event (GdkEventScroll* ev)
        switch (ev->direction) {
        case GDK_SCROLL_LEFT:
                wv += step;
-               width_control->set_value (wv);
+               width_control->set_value (wv, Controllable::NoGroup);
                break;
        case GDK_SCROLL_UP:
                pv -= step;
-               position_control->set_value (pv);
+               position_control->set_value (pv, Controllable::NoGroup);
                break;
        case GDK_SCROLL_RIGHT:
                wv -= step;
-               width_control->set_value (wv);
+               width_control->set_value (wv, Controllable::NoGroup);
                break;
        case GDK_SCROLL_DOWN:
                pv += step;
-               position_control->set_value (pv);
+               position_control->set_value (pv, Controllable::NoGroup);
                break;
        }
 
@@ -537,7 +538,7 @@ StereoPanner::on_motion_notify_event (GdkEventMotion* ev)
        if (dragging_left) {
                delta = -delta;
        }
-       
+
        if (dragging_left || dragging_right) {
 
                if (Keyboard::modifier_state_contains (ev->state, Keyboard::SecondaryModifier)) {
@@ -547,13 +548,13 @@ StereoPanner::on_motion_notify_event (GdkEventMotion* ev)
                         */
 
                        _panner->freeze ();
-                       
+
                        double pv = position_control->get_value();
 
                        if (dragging_left) {
-                               position_control->set_value (pv - delta);
+                               position_control->set_value (pv - delta, Controllable::NoGroup);
                        } else {
-                               position_control->set_value (pv + delta);
+                               position_control->set_value (pv + delta, Controllable::NoGroup);
                        }
 
                        if (delta > 0.0) {
@@ -563,9 +564,9 @@ StereoPanner::on_motion_notify_event (GdkEventMotion* ev)
                                   other side remains in place when we set
                                   the position as well.
                                */
-                               width_control->set_value (current_width + (delta * 2.0));
+                               width_control->set_value (current_width + (delta * 2.0), Controllable::NoGroup);
                        } else {
-                               width_control->set_value (current_width + delta);
+                               width_control->set_value (current_width + delta, Controllable::NoGroup);
                        }
 
                        _panner->thaw ();
@@ -573,37 +574,37 @@ StereoPanner::on_motion_notify_event (GdkEventMotion* ev)
                } else {
 
                        /* maintain position as invariant as we change the width */
-                       
+
                        /* create a detent close to the center */
-                       
+
                        if (!detented && fabs (current_width) < 0.02) {
                                detented = true;
                                /* snap to zero */
-                               width_control->set_value (0);
+                               width_control->set_value (0, Controllable::NoGroup);
                        }
-                       
+
                        if (detented) {
-                               
+
                                accumulated_delta += delta;
-                               
+
                                /* have we pulled far enough to escape ? */
-                               
+
                                if (fabs (accumulated_delta) >= 0.025) {
-                                       width_control->set_value (current_width + accumulated_delta);
+                                       width_control->set_value (current_width + accumulated_delta, Controllable::NoGroup);
                                        detented = false;
                                        accumulated_delta = false;
                                }
-                               
+
                        } else {
                                /* width needs to change by 2 * delta because both L & R move */
-                               width_control->set_value (current_width + (delta * 2.0));
+                               width_control->set_value (current_width + (delta * 2.0), Controllable::NoGroup);
                        }
                }
 
        } else if (dragging_position) {
 
                double pv = position_control->get_value(); // 0..1.0 ; 0 = left
-               position_control->set_value (pv + delta);
+               position_control->set_value (pv + delta, Controllable::NoGroup);
        }
 
        last_drag_x = ev->x;
@@ -635,30 +636,30 @@ StereoPanner::on_key_press_event (GdkEventKey* ev)
        switch (ev->keyval) {
        case GDK_Up:
                if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
-                       width_control->set_value (1.0);
+                       width_control->set_value (1.0, Controllable::NoGroup);
                } else {
-                       width_control->set_value (wv + step);
+                       width_control->set_value (wv + step, Controllable::NoGroup);
                }
                break;
        case GDK_Down:
                if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
-                       width_control->set_value (-1.0);
+                       width_control->set_value (-1.0, Controllable::NoGroup);
                } else {
-                       width_control->set_value (wv - step);
+                       width_control->set_value (wv - step, Controllable::NoGroup);
                }
                break;
 
        case GDK_Left:
                pv -= step;
-               position_control->set_value (pv);
+               position_control->set_value (pv, Controllable::NoGroup);
                break;
        case GDK_Right:
                pv += step;
-               position_control->set_value (pv);
+               position_control->set_value (pv, Controllable::NoGroup);
                break;
        case GDK_0:
        case GDK_KP_0:
-               width_control->set_value (0.0);
+               width_control->set_value (0.0, Controllable::NoGroup);
                break;
 
        default:
@@ -673,7 +674,7 @@ StereoPanner::set_colors ()
 {
        colors[Normal].fill = UIConfiguration::instance().color_mod ("stereo panner fill", "panner fill");
        // colors[Normal].outline = UIConfiguration::instance().color ("stereo panner outline");
-       colors[Normal].outline = ArdourCanvas::HSV (colors[Normal].fill).outline().color ();
+       colors[Normal].outline = Gtkmm2ext::HSV (colors[Normal].fill).outline().color ();
        colors[Normal].text = UIConfiguration::instance().color ("stereo panner text");
        colors[Normal].background = UIConfiguration::instance().color ("stereo panner bg");
        colors[Normal].rule = UIConfiguration::instance().color ("stereo panner rule");
Unnamed repository; edit this file 'description' to name the repository.