#include "gtkmm2ext/rgb_macros.h"
#include "actions.h"
-#include "ardour_ui.h"
#include "rgb_macros.h"
#include "shuttle_control.h"
+#include "tooltips.h"
#include "i18n.h"
using namespace Gtk;
using namespace Gtkmm2ext;
using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
using std::min;
using std::max;
: _controllable (new ShuttleControllable (*this))
, binding_proxy (_controllable)
{
- ARDOUR_UI::instance()->set_tip (*this, _("Shuttle speed control (Context-click for options)"));
+ set_tooltip (*this, _("Shuttle speed control (Context-click for options)"));
pattern = 0;
shine_pattern = 0;
set_size_request (85, 20);
set_name (X_("ShuttleControl"));
+ 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());
/* gtkmm 2.4: the C++ wrapper doesn't work */
//background
pattern = cairo_pattern_create_linear (0, 0, 0, alloc.get_height());
- uint32_t col = ARDOUR_UI::config()->color ("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);
{
float speed = _session->transport_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 {
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
shuttle_context_menu->popup (1, gtk_get_current_event_time());
}
+void
+ShuttleControl::reset_speed ()
+{
+ if (_session->transport_rolling()) {
+ _session->request_transport_speed (1.0, true);
+ } else {
+ _session->request_transport_speed (0.0, true);
+ }
+}
+
void
ShuttleControl::set_shuttle_max_speed (float speed)
{
+ Config->set_shuttle_max_speed (speed);
shuttle_max_speed = speed;
+ last_speed_displayed = -99999999;
}
bool
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);
}
default:
return false;
}
-
+
if (semis) {
float lower_side_of_dead_zone = semitones_as_fract (-24, true);
//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);
float speed = 0.0;
}
/* 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;
+ float visual_fraction = std::min (1.0f, speed / shuttle_max_speed);
+ float marker_size = get_height() - 5.0;
+ float avail_width = get_width() - marker_size - 4;
+ float x = get_width() * 0.5 + visual_fraction * avail_width * 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);
+ cairo_move_to( cr, x, 2.5);
+ cairo_line_to( cr, x + marker_size * .577, 2.5 + marker_size * 0.5);
+ cairo_line_to( cr, x, 2.5 + marker_size);
+ cairo_close_path(cr);
} else if ( speed ==0.0 )
- rounded_rectangle (cr, offset, 4, marker_size-2, marker_size-2, 1);
+ rounded_rectangle (cr, x, 2.5, marker_size, marker_size, 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_arc (cr, x, 2.5 + marker_size * .5, marker_size * 0.47, 0, 2.0 * M_PI);
+ cairo_set_line_width (cr, 1.75);
cairo_stroke (cr);
/* speed text */
snprintf (buf, sizeof (buf), "%s", _("Playing"));
} else {
if (speed < 0.0) {
- snprintf (buf, sizeof (buf), "<<< %d%%", (int) round (-speed * 100));
+ snprintf (buf, sizeof (buf), "<<< %.1f%%", -speed * 100.f);
} else {
- snprintf (buf, sizeof (buf), ">>> %d%%", (int) round (speed * 100));
+ snprintf (buf, sizeof (buf), ">>> %.1f%%", speed * 100.f);
}
}
last_speed_displayed = speed;
+ // TODO use a proper pango layout, scale font
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_text_extents (cr, "0|", &extents); // note the descender
+ const float text_ypos = (get_height() + extents.height - 1.) * .5;
+
+ cairo_move_to (cr, 10, text_ypos);
cairo_show_text (cr, buf);
/* style text */
}
cairo_text_extents (cr, buf, &extents);
- cairo_move_to (cr, get_width() - (fabs(extents.x_advance) + 5), extents.height + 4);
+ cairo_move_to (cr, get_width() - (fabs(extents.x_advance) + 5), text_ypos);
cairo_show_text (cr, 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_UI::config()->get_widget_prelight()) {
+ if (UIConfiguration::instance().get_widget_prelight()) {
if (_hovering) {
- rounded_rectangle (cr, 1, 1, get_width()-2, get_height()-2, _corner_radius);
+ rounded_rectangle (cr, 1, 1, get_width()-2, get_height()-2, 4.0);
cairo_set_source_rgba (cr, 1, 1, 1, 0.2);
cairo_fill (cr);
}
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)
}
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);
}
{
_hovering = true;
- if (ARDOUR_UI::config()->get_widget_prelight()) {
+ if (UIConfiguration::instance().get_widget_prelight()) {
queue_draw ();
}
{
_hovering = false;
- if (ARDOUR_UI::config()->get_widget_prelight()) {
+ if (UIConfiguration::instance().get_widget_prelight()) {
queue_draw ();
}
projects / ardour.git / blobdiff