X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fshuttle_control.cc;h=c18bacc20f3f474960dc99b72fe41ba2cc00dfa1;hb=95a61717faa4b427be0e7821ee91f7df81065815;hp=1d150f73d67511ff8a60ab838e0820a3376e601c;hpb=5e5c71614664d02e1160454f080505fbcc2078aa;p=ardour.git diff --git a/gtk2_ardour/shuttle_control.cc b/gtk2_ardour/shuttle_control.cc index 1d150f73d6..c18bacc20f 100644 --- a/gtk2_ardour/shuttle_control.cc +++ b/gtk2_ardour/shuttle_control.cc @@ -16,6 +16,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#define BASELINESTRETCH (1.25) + #include #include @@ -25,22 +27,24 @@ #include "ardour/rc_configuration.h" #include "ardour/session.h" +#include "gtkmm2ext/colors.h" #include "gtkmm2ext/keyboard.h" #include "gtkmm2ext/gui_thread.h" -#include "gtkmm2ext/cairocell.h" #include "gtkmm2ext/utils.h" #include "gtkmm2ext/rgb_macros.h" +#include "widgets/tooltips.h" + #include "actions.h" -#include "ardour_ui.h" #include "rgb_macros.h" #include "shuttle_control.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace Gtk; using namespace Gtkmm2ext; using namespace ARDOUR; +using namespace ArdourWidgets; using std::min; using std::max; @@ -53,7 +57,14 @@ ShuttleControl::ShuttleControl () : _controllable (new ShuttleControllable (*this)) , binding_proxy (_controllable) { - ARDOUR_UI::instance()->set_tip (*this, _("Shuttle speed control (Context-click for options)")); + _info_button.set_layout_font (UIConfiguration::instance().get_NormalFont()); + _info_button.set_sizing_text (S_("LogestShuttle|< +00 st")); + _info_button.set_name ("shuttle text"); + _info_button.set_sensitive (false); + _info_button.set_visual_state (Gtkmm2ext::NoVisualState); + _info_button.set_elements (ArdourButton::Text); + + set_tooltip (*this, _("Shuttle speed control (Context-click for options)")); pattern = 0; shine_pattern = 0; @@ -70,10 +81,23 @@ ShuttleControl::ShuttleControl () set_flags (CAN_FOCUS); add_events (Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::BUTTON_PRESS_MASK|Gdk::POINTER_MOTION_MASK|Gdk::SCROLL_MASK); - set_size_request (85, 20); set_name (X_("ShuttleControl")); + ensure_style (); + + shuttle_max_speed = Config->get_shuttle_max_speed(); + + if (shuttle_max_speed >= 8.f) { shuttle_max_speed = 8.0f; } + else if (shuttle_max_speed >= 6.f) { shuttle_max_speed = 6.0f; } + else if (shuttle_max_speed >= 4.f) { shuttle_max_speed = 4.0f; } + else if (shuttle_max_speed >= 3.f) { shuttle_max_speed = 3.0f; } + else if (shuttle_max_speed >= 2.f) { shuttle_max_speed = 2.0f; } + else { shuttle_max_speed = 1.5f; } + Config->ParameterChanged.connect (parameter_connection, MISSING_INVALIDATOR, boost::bind (&ShuttleControl::parameter_changed, this, _1), gui_context()); + UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &ShuttleControl::set_colors)); + + set_colors (); /* gtkmm 2.4: the C++ wrapper doesn't work */ g_signal_connect ((GObject*) gobj(), "query-tooltip", G_CALLBACK (qt), NULL); @@ -113,7 +137,7 @@ ShuttleControl::on_size_allocate (Gtk::Allocation& alloc) //background pattern = cairo_pattern_create_linear (0, 0, 0, alloc.get_height()); - uint32_t col = ARDOUR_UI::config()->get_canvasvar_Shuttle(); + uint32_t col = UIConfiguration::instance().color ("shuttle"); int r,b,g,a; UINT_TO_RGBA(col, &r, &g, &b, &a); cairo_pattern_add_color_stop_rgb (pattern, 0.0, r/400.0, g/400.0, b/400.0); @@ -130,8 +154,17 @@ ShuttleControl::on_size_allocate (Gtk::Allocation& alloc) void ShuttleControl::map_transport_state () { - float speed = _session->transport_speed (); + float speed = _session->actual_speed (); + if ( (fabsf( speed - last_speed_displayed) < 0.005f) // dead-zone + && !( speed == 1.f && last_speed_displayed != 1.f) + && !( speed == 0.f && last_speed_displayed != 0.f) + ) + { + return; // nothing to see here, move along. + } + + // Q: is there a good reason why we re-calculate this every time? if (fabs(speed) <= (2*DBL_EPSILON)) { shuttle_fract = 0; } else { @@ -216,22 +249,26 @@ ShuttleControl::build_shuttle_context_menu () items.push_back (MenuElem (_("Maximum speed"), *speed_menu)); + items.push_back (SeparatorElem ()); + items.push_back (MenuElem (_("Reset to 100%"), sigc::mem_fun (*this, &ShuttleControl::reset_speed))); } void -ShuttleControl::show_shuttle_context_menu () +ShuttleControl::reset_speed () { - if (shuttle_context_menu == 0) { - build_shuttle_context_menu (); + if (_session->transport_rolling()) { + _session->request_transport_speed (1.0, true); + } else { + _session->request_transport_speed (0.0, true); } - - shuttle_context_menu->popup (1, gtk_get_current_event_time()); } void ShuttleControl::set_shuttle_max_speed (float speed) { + Config->set_shuttle_max_speed (speed); shuttle_max_speed = speed; + last_speed_displayed = -99999999; } bool @@ -246,7 +283,10 @@ ShuttleControl::on_button_press_event (GdkEventButton* ev) } if (Keyboard::is_context_menu_event (ev)) { - show_shuttle_context_menu (); + if (shuttle_context_menu == 0) { + build_shuttle_context_menu (); + } + shuttle_context_menu->popup (ev->button, ev->time); return true; } @@ -259,11 +299,12 @@ ShuttleControl::on_button_press_event (GdkEventButton* ev) } else { add_modal_grab (); shuttle_grabbed = true; - shuttle_speed_on_grab = _session->transport_speed (); + shuttle_speed_on_grab = _session->actual_speed (); + requested_speed = shuttle_speed_on_grab; mouse_shuttle (ev->x, true); gdk_pointer_grab(ev->window,false, - GdkEventMask( Gdk::POINTER_MOTION_MASK | Gdk::BUTTON_PRESS_MASK |Gdk::BUTTON_RELEASE_MASK), - NULL,NULL,ev->time); + GdkEventMask( Gdk::POINTER_MOTION_MASK | Gdk::BUTTON_PRESS_MASK |Gdk::BUTTON_RELEASE_MASK), + NULL,NULL,ev->time); } break; @@ -289,12 +330,13 @@ ShuttleControl::on_button_release_event (GdkEventButton* ev) shuttle_grabbed = false; remove_modal_grab (); gdk_pointer_ungrab (GDK_CURRENT_TIME); - + if (Config->get_shuttle_behaviour() == Sprung) { if (shuttle_speed_on_grab == 0 ) { - _session->request_transport_speed (1.0); + _session->request_stop (); + } else { + _session->request_transport_speed (shuttle_speed_on_grab); } - _session->request_transport_speed (shuttle_speed_on_grab); } else { mouse_shuttle (ev->x, true); } @@ -363,7 +405,7 @@ ShuttleControl::on_scroll_event (GdkEventScroll* ev) default: return false; } - + if (semis) { float lower_side_of_dead_zone = semitones_as_fract (-24, true); @@ -504,6 +546,7 @@ ShuttleControl::use_shuttle_fract (bool force, bool zero_ok) speed = shuttle_max_speed * shuttle_fract; } + requested_speed = speed; if (zero_ok) { _session->request_transport_speed (speed, Config->get_shuttle_behaviour() == Wheel); } else { @@ -512,125 +555,108 @@ ShuttleControl::use_shuttle_fract (bool force, bool zero_ok) } void -ShuttleControl::render (cairo_t* cr) +ShuttleControl::set_colors () { - cairo_text_extents_t extents; + int r, g, b, a; - //black border - cairo_set_source_rgb (cr, 0, 0.0, 0.0); - rounded_rectangle (cr, 0, 0, get_width(), get_height(), 4); -// cairo_fill_preserve (cr); -// cairo_stroke (cr); - cairo_fill (cr); + uint32_t bg_color = UIConfiguration::instance().color (X_("shuttle bg")); - float speed = 0.0; + UINT_TO_RGBA (bg_color, &r, &g, &b, &a); + bg_r = r/255.0; + bg_g = g/255.0; + bg_b = b/255.0; +} - if (_session) { - speed = _session->transport_speed (); +void +ShuttleControl::render (Cairo::RefPtr const& ctx, cairo_rectangle_t*) +{ + cairo_t* cr = ctx->cobj(); + // center slider line + float yc = get_height() / 2; + float lw = 3; + cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND); + cairo_set_line_width (cr, 3); + cairo_move_to (cr, lw, yc); + cairo_line_to (cr, get_width () - lw, yc); + cairo_set_source_rgb (cr, bg_r, bg_g, bg_b); + if (UIConfiguration::instance().get_widget_prelight() && _hovering) { + cairo_stroke_preserve (cr); + cairo_set_source_rgba (cr, 1, 1, 1, 0.15); } - - /* Marker */ - float visual_fraction = std::min (1.0f, speed/shuttle_max_speed); - float marker_size = get_height()-4; - float avail_width = get_width() - marker_size; - float x = get_width()*0.5 + visual_fraction * avail_width*0.5; - float offset = x - marker_size*0.5; -// cairo_set_source_rgb (cr, 0, 1, 0.0); - cairo_set_source (cr, pattern); - if (speed == 1.0) { - cairo_move_to( cr, offset-4, 2); - cairo_line_to( cr, offset+4, 2+marker_size*0.5); - cairo_line_to( cr, offset-4, 2+marker_size); - cairo_line_to( cr, offset-4, 2); - } else if ( speed ==0.0 ) - rounded_rectangle (cr, offset, 4, marker_size-2, marker_size-2, 1); - else - cairo_arc (cr, offset + marker_size*0.5, 2 + marker_size*0.5, marker_size*0.5, 0, 360); - cairo_set_line_width (cr, 2); cairo_stroke (cr); - /* speed text */ - + float speed = 0.0; + float acutal_speed = 0.0; char buf[32]; - if (speed != 0) { + if (_session) { + speed = _session->actual_speed (); + acutal_speed = speed; + if (shuttle_grabbed) { + speed = requested_speed; + } + } - if (Config->get_shuttle_units() == Percentage) { + /* marker */ + float visual_fraction = std::max (-1.0f, std::min (1.0f, speed / shuttle_max_speed)); + float marker_size = round (get_height() * 0.66); + float avail_width = get_width() - marker_size; + float x = 0.5 * (get_width() + visual_fraction * avail_width - marker_size); + + rounded_rectangle (cr, x, 0, marker_size, get_height(), 5); + cairo_set_source_rgba (cr, 0, 0, 0, 1); + cairo_fill(cr); + rounded_rectangle (cr, x + 1, 1, marker_size - 2, get_height() - 2, 3.5); + if (_flat_buttons) { + uint32_t col = UIConfiguration::instance().color ("shuttle"); + Gtkmm2ext::set_source_rgba (cr, col); + } else { + cairo_set_source (cr, pattern); + } + if (UIConfiguration::instance().get_widget_prelight() && _hovering) { + cairo_fill_preserve (cr); + cairo_set_source_rgba (cr, 1, 1, 1, 0.15); + } + cairo_fill(cr); - if (speed == 1.0) { - snprintf (buf, sizeof (buf), "%s", _("Playing")); + /* text */ + if (acutal_speed != 0) { + if (Config->get_shuttle_units() == Percentage) { + if (acutal_speed == 1.0) { + snprintf (buf, sizeof (buf), "%s", _("Play")); } else { - if (speed < 0.0) { - snprintf (buf, sizeof (buf), "<<< %d%%", (int) round (-speed * 100)); + if (acutal_speed < 0.0) { + snprintf (buf, sizeof (buf), "< %.1f%%", -acutal_speed * 100.f); } else { - snprintf (buf, sizeof (buf), ">>> %d%%", (int) round (speed * 100)); + snprintf (buf, sizeof (buf), "> %.1f%%", acutal_speed * 100.f); } } - } else { - bool reversed; - int semi = speed_as_semitones (speed, reversed); - + int semi = speed_as_semitones (acutal_speed, reversed); if (reversed) { - snprintf (buf, sizeof (buf), _("<<< %+d semitones"), semi); + snprintf (buf, sizeof (buf), _("< %+2d st"), semi); } else { - snprintf (buf, sizeof (buf), _(">>> %+d semitones"), semi); + snprintf (buf, sizeof (buf), _("> %+2d st"), semi); } } - } else { - snprintf (buf, sizeof (buf), "%s", _("Stopped")); + snprintf (buf, sizeof (buf), "%s", _("Stop")); } - last_speed_displayed = speed; - - cairo_set_source_rgb (cr, 0.6, 0.6, 0.6); - cairo_text_extents (cr, buf, &extents); - cairo_move_to (cr, 10, extents.height + 4); - cairo_set_font_size (cr, 13.0); - cairo_show_text (cr, buf); - - /* style text */ - - - switch (Config->get_shuttle_behaviour()) { - case Sprung: - snprintf (buf, sizeof (buf), "%s", _("Sprung")); - break; - case Wheel: - snprintf (buf, sizeof (buf), "%s", _("Wheel")); - break; - } + last_speed_displayed = acutal_speed; - cairo_text_extents (cr, buf, &extents); - cairo_move_to (cr, get_width() - (fabs(extents.x_advance) + 5), extents.height + 4); - cairo_show_text (cr, buf); + _info_button.set_text (buf); - float _corner_radius = 4.0; - -/* //reflection - float rheight = 10.0; - Gtkmm2ext::rounded_rectangle (cr, 2, 1, get_width()-4, rheight, _corner_radius); - cairo_set_source (cr, shine_pattern); - cairo_fill (cr); -*/ - if (ARDOUR::Config->get_widget_prelight()) { +#if 0 + if (UIConfiguration::instance().get_widget_prelight()) { if (_hovering) { - rounded_rectangle (cr, 1, 1, get_width()-2, get_height()-2, _corner_radius); - cairo_set_source_rgba (cr, 1, 1, 1, 0.2); + rounded_rectangle (cr, 0, 0, get_width(), get_height(), 3.5); + cairo_set_source_rgba (cr, 1, 1, 1, 0.15); cairo_fill (cr); } } -} - -void -ShuttleControl::shuttle_unit_clicked () -{ - if (shuttle_unit_menu == 0) { - shuttle_unit_menu = dynamic_cast (ActionManager::get_widget ("/ShuttleUnitPopup")); - } - shuttle_unit_menu->popup (1, gtk_get_current_event_time()); +#endif } void @@ -645,14 +671,6 @@ ShuttleControl::set_shuttle_units (ShuttleUnits s) Config->set_shuttle_units (s); } -void -ShuttleControl::update_speed_display () -{ - if (_session->transport_speed() != last_speed_displayed) { - queue_draw (); - } -} - ShuttleControl::ShuttleControllable::ShuttleControllable (ShuttleControl& s) : PBD::Controllable (X_("Shuttle")) , sc (s) @@ -660,7 +678,7 @@ ShuttleControl::ShuttleControllable::ShuttleControllable (ShuttleControl& s) } void -ShuttleControl::ShuttleControllable::set_value (double val) +ShuttleControl::ShuttleControllable::set_value (double val, PBD::Controllable::GroupControlDisposition /*group_override*/) { sc.set_shuttle_fract ((val - lower()) / (upper() - lower()), true); } @@ -681,7 +699,7 @@ ShuttleControl::parameter_changed (std::string p) */ if (_session) { if (_session->transport_rolling()) { - if (_session->transport_speed() == 1.0) { + if (_session->actual_speed() == 1.0) { queue_draw (); } else { /* reset current speed and @@ -701,6 +719,8 @@ ShuttleControl::parameter_changed (std::string p) break; } + } else if (p == "shuttle-max-speed") { + queue_draw (); } else if (p == "shuttle-units") { queue_draw (); } @@ -712,7 +732,7 @@ ShuttleControl::on_enter_notify_event (GdkEventCrossing* ev) { _hovering = true; - if (ARDOUR::Config->get_widget_prelight()) { + if (UIConfiguration::instance().get_widget_prelight()) { queue_draw (); } @@ -724,7 +744,7 @@ ShuttleControl::on_leave_notify_event (GdkEventCrossing* ev) { _hovering = false; - if (ARDOUR::Config->get_widget_prelight()) { + if (UIConfiguration::instance().get_widget_prelight()) { queue_draw (); }