In export format dialog, show preview of generated part of description. Fix to #0004941

[ardour.git] / gtk2_ardour / shuttle_control.cc

diff --git a/gtk2_ardour/shuttle_control.cc b/gtk2_ardour/shuttle_control.cc
index 24f70904981d905ad96c3e2d6b70a6f4e7735c1f..88159fe0209b2b943121e3bcd3c37bb78525cca4 100644 (file)
--- a/gtk2_ardour/shuttle_control.cc
+++ b/gtk2_ardour/shuttle_control.cc
@@ -67,7 +67,7 @@ ShuttleControl::ShuttleControl ()
        set_size_request (100, 15);
        set_name (X_("ShuttleControl"));
 
-       Config->ParameterChanged.connect (parameter_connection, MISSING_INVALIDATOR, ui_bind (&ShuttleControl::parameter_changed, this, _1), gui_context());
+       Config->ParameterChanged.connect (parameter_connection, MISSING_INVALIDATOR, boost::bind (&ShuttleControl::parameter_changed, this, _1), gui_context());
 
        /* gtkmm 2.4: the C++ wrapper doesn't work */
        g_signal_connect ((GObject*) gobj(), "query-tooltip", G_CALLBACK (qt), NULL);
@@ -278,7 +278,7 @@ ShuttleControl::on_button_release_event (GdkEventButton* ev)
 
        case 2:
                if (_session->transport_rolling()) {
-                       _session->request_transport_speed (1.0);
+                       _session->request_transport_speed (1.0, Config->get_shuttle_behaviour() == Wheel);
                }
                return true;
 
@@ -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);
@@ -457,11 +479,11 @@ ShuttleControl::use_shuttle_fract (bool force)
                speed = shuttle_max_speed * shuttle_fract;
        }
 
-       _session->request_transport_speed_nonzero (speed);
+       _session->request_transport_speed_nonzero (speed, true);
 }
 
 bool
-ShuttleControl::on_expose_event (GdkEventExpose* event)
+ShuttleControl::on_expose_event (GdkEventExpose*)
 {
        cairo_text_extents_t extents;
        Glib::RefPtr<Gdk::Window> win (get_window());
@@ -500,7 +522,7 @@ ShuttleControl::on_expose_event (GdkEventExpose* event)
                if (Config->get_shuttle_units() == Percentage) {
 
                        if (speed == 1.0) {
-                               snprintf (buf, sizeof (buf), _("Playing"));
+                               snprintf (buf, sizeof (buf), "%s", _("Playing"));
                        } else {
                                if (speed < 0.0) {
                                        snprintf (buf, sizeof (buf), "<<< %d%%", (int) round (-speed * 100));
@@ -522,7 +544,7 @@ ShuttleControl::on_expose_event (GdkEventExpose* event)
                }
 
        } else {
-               snprintf (buf, sizeof (buf), _("Stopped"));
+               snprintf (buf, sizeof (buf), "%s", _("Stopped"));
        }
 
        last_speed_displayed = speed;
@@ -537,10 +559,10 @@ ShuttleControl::on_expose_event (GdkEventExpose* event)
 
        switch (Config->get_shuttle_behaviour()) {
        case Sprung:
-               snprintf (buf, sizeof (buf), _("Sprung"));
+               snprintf (buf, sizeof (buf), "%s", _("Sprung"));
                break;
        case Wheel:
-               snprintf (buf, sizeof (buf), _("Wheel"));
+               snprintf (buf, sizeof (buf), "%s", _("Wheel"));
                break;
        }
 
@@ -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)
 {
@@ -632,6 +648,9 @@ ShuttleControl::parameter_changed (std::string p)
                                        if (_session->transport_speed() == 1.0) {
                                                queue_draw ();
                                        } else {
+                                               /* reset current speed and
+                                                  revert to 1.0 as the default
+                                               */
                                                _session->request_transport_speed (1.0);
                                                /* redraw when speed changes */
                                        }