Merge branch 'master' into ccmerge

[ardour.git] / gtk2_ardour / mono_panner.cc

diff --git a/gtk2_ardour/mono_panner.cc b/gtk2_ardour/mono_panner.cc
index 7dd16d4853db726c4c325471fc874275c75b126c..e29ec01b705713224e5647174a614346f196247a 100644 (file)
--- a/gtk2_ardour/mono_panner.cc
+++ b/gtk2_ardour/mono_panner.cc
@@ -98,7 +98,7 @@ MonoPanner::set_tooltip ()
         */
 
         char buf[64];
-        snprintf (buf, sizeof (buf), "L:%3d R:%3d",
+        snprintf (buf, sizeof (buf), _("L:%3d R:%3d"),
                   (int) rint (100.0 * (1.0 - pos)),
                   (int) rint (100.0 * pos));
         _tooltip.set_tip (buf);
@@ -412,10 +412,6 @@ MonoPanner::on_key_press_event (GdkEventKey* ev)
                 step = one_degree * 5.0;
         }
 
-        /* up/down control width because we consider pan position more "important"
-           (and thus having higher "sense" priority) than width.
-        */
-
         switch (ev->keyval) {
         case GDK_Left:
                 pv -= step;
@@ -425,6 +421,10 @@ MonoPanner::on_key_press_event (GdkEventKey* ev)
                 pv += step;
                 position_control->set_value (pv);
                 break;
+       case GDK_0:
+       case GDK_KP_0:
+               position_control->set_value (0.0);
+               break;
         default:
                 return false;
         }
@@ -435,12 +435,12 @@ MonoPanner::on_key_press_event (GdkEventKey* ev)
 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