remove OS X specific code for key editor binding displays

[ardour.git] / gtk2_ardour / mono_panner.cc

diff --git a/gtk2_ardour/mono_panner.cc b/gtk2_ardour/mono_panner.cc
index 78fec4e6796b7522b0ee50ad95d1c30cb88b6a43..791c3e8d0b52b733c9f4b210479d80ac94f2c554 100644 (file)
--- a/gtk2_ardour/mono_panner.cc
+++ b/gtk2_ardour/mono_panner.cc
@@ -34,6 +34,7 @@
 
 #include "ardour/panner.h"
 #include "ardour/panner.h"
+#include "ardour/pannable.h"
 
 #include "ardour_ui.h"
 #include "global_signals.h"
@@ -55,8 +56,9 @@ static const int top_step = 2;
 MonoPanner::ColorScheme MonoPanner::colors;
 bool MonoPanner::have_colors = false;
 
-MonoPanner::MonoPanner (boost::shared_ptr<PBD::Controllable> position)
-        : position_control (position)
+MonoPanner::MonoPanner (boost::shared_ptr<ARDOUR::Panner> panner)
+       : _panner (panner)
+       , position_control (_panner->pannable()->pan_azimuth_control)
         , dragging (false)
         , drag_start_x (0)
         , last_drag_x (0)
@@ -64,7 +66,7 @@ MonoPanner::MonoPanner (boost::shared_ptr<PBD::Controllable> position)
         , detented (false)
         , drag_data_window (0)
         , drag_data_label (0)
-        , position_binder (position)
+        , position_binder (position_control)
 {
         if (!have_colors) {
                 set_colors ();
@@ -121,7 +123,7 @@ MonoPanner::value_change ()
 }
 
 bool
-MonoPanner::on_expose_event (GdkEventExpose* ev)
+MonoPanner::on_expose_event (GdkEventExpose*)
 {
        Glib::RefPtr<Gdk::Window> win (get_window());
        Glib::RefPtr<Gdk::GC> gc (get_style()->get_base_gc (get_state()));
@@ -333,8 +335,7 @@ MonoPanner::on_button_release_event (GdkEventButton* ev)
         }
 
         if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) {
-                /* reset to default */
-                position_control->set_value (0.5);
+               _panner->reset ();
         } else {
                 StopGesture ();
         }
@@ -469,13 +470,13 @@ MonoPanner::on_key_press_event (GdkEventKey* ev)
 }
 
 bool
-MonoPanner::on_key_release_event (GdkEventKey* ev)
+MonoPanner::on_key_release_event (GdkEventKey*)
 {
         return false;
 }
 
 bool
-MonoPanner::on_enter_notify_event (GdkEventCrossing* ev)
+MonoPanner::on_enter_notify_event (GdkEventCrossing*)
 {
        grab_focus ();
        Keyboard::magic_widget_grab_focus ();