Remove unused code.

[ardour.git] / gtk2_ardour / shuttle_control.cc

diff --git a/gtk2_ardour/shuttle_control.cc b/gtk2_ardour/shuttle_control.cc
index 24f70904981d905ad96c3e2d6b70a6f4e7735c1f..2fb2a3357e0ac9fdc56987ec8eb071ad864df4c2 100644 (file)
--- a/gtk2_ardour/shuttle_control.cc
+++ b/gtk2_ardour/shuttle_control.cc
@@ -304,20 +304,42 @@ ShuttleControl::on_scroll_event (GdkEventScroll* ev)
                return true;
        }
 
+       bool semis = (Config->get_shuttle_units() == Semitones);
+
        switch (ev->direction) {
        case GDK_SCROLL_UP:
        case GDK_SCROLL_RIGHT:
-               shuttle_fract += 0.005;
+               if (semis) {
+                       if (shuttle_fract == 0) {
+                               shuttle_fract = semitones_as_fract (1, false);
+                       } else {
+                               bool rev;
+                               int st = fract_as_semitones (shuttle_fract, rev);
+                               shuttle_fract = semitones_as_fract (st + 1, rev);
+                       }
+               } else {
+                       shuttle_fract += 0.00125;
+               }
                break;
        case GDK_SCROLL_DOWN:
        case GDK_SCROLL_LEFT:
-               shuttle_fract -= 0.005;
+               if (semis) {
+                       if (shuttle_fract == 0) {
+                               shuttle_fract = semitones_as_fract (1, true);
+                       } else {
+                               bool rev;
+                               int st = fract_as_semitones (shuttle_fract, rev);
+                               shuttle_fract = semitones_as_fract (st - 1, rev);
+                       }
+               } else {
+                       shuttle_fract -= 0.00125;
+               }
                break;
        default:
                return false;
        }
-
-       if (Config->get_shuttle_units() == Semitones) {
+       
+       if (semis) {
 
                float lower_side_of_dead_zone = semitones_as_fract (-24, true);
                float upper_side_of_dead_zone = semitones_as_fract (-24, false);
@@ -461,7 +483,7 @@ ShuttleControl::use_shuttle_fract (bool force)
 }
 
 bool
-ShuttleControl::on_expose_event (GdkEventExpose* event)
+ShuttleControl::on_expose_event (GdkEventExpose*)
 {
        cairo_text_extents_t extents;
        Glib::RefPtr<Gdk::Window> win (get_window());
@@ -589,12 +611,6 @@ ShuttleControl::ShuttleControllable::ShuttleControllable (ShuttleControl& s)
 {
 }
 
-void
-ShuttleControl::ShuttleControllable::set_id (const std::string& str)
-{
-       _id = str;
-}
-
 void
 ShuttleControl::ShuttleControllable::set_value (double val)
 {