#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 "canvas/utils.h"
-#include "canvas/colors.h"
+#include "widgets/tooltips.h"
#include "actions.h"
#include "rgb_macros.h"
#include "shuttle_control.h"
-#include "tooltips.h"
#include "pbd/i18n.h"
using namespace Gtk;
using namespace Gtkmm2ext;
using namespace ARDOUR;
-using namespace ARDOUR_UI_UTILS;
+using namespace ArdourWidgets;
using std::min;
using std::max;
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)
} 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,
}
void
-ShuttleControl::render (cairo_t* cr, cairo_rectangle_t*)
+ShuttleControl::render (Cairo::RefPtr<Cairo::Context> const& ctx, cairo_rectangle_t*)
{
+ cairo_t* cr = ctx->cobj();
// center slider line
float yc = get_height() / 2;
float lw = 3;
char buf[32];
if (_session) {
- speed = _session->transport_speed ();
+ speed = _session->actual_speed ();
acutal_speed = speed;
if (shuttle_grabbed) {
speed = requested_speed;
rounded_rectangle (cr, x + 1, 1, marker_size - 2, get_height() - 2, 3.5);
if (_flat_buttons) {
uint32_t col = UIConfiguration::instance().color ("shuttle");
- ArdourCanvas::set_source_rgba (cr, col);
+ Gtkmm2ext::set_source_rgba (cr, col);
} else {
cairo_set_source (cr, pattern);
}
*/
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