smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 14:54:56 +01:00
Code Issues Projects Releases Wiki Activity

Quick hack to test engine vari-speed (2/2)

Browse source
This commit is contained in:
Robin Gareus 2017-10-29 18:32:27 +01:00
parent 6e11844889
commit bc18c54c73
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/editor_routes.cc
View file

@ -1477,7 +1477,7 @@ EditorRoutes::initial_display ()
{ {
if (!_session) { if (!_session) {
_model->clear (); clear ();
return; return;
} }

8
gtk2_ardour/shuttle_control.cc
View file

@ -154,7 +154,7 @@ ShuttleControl::on_size_allocate (Gtk::Allocation& alloc)
void void
ShuttleControl::map_transport_state () ShuttleControl::map_transport_state ()
{ {
float speed = _session->transport_speed (); float speed = _session->actual_speed ();
if ( (fabsf( speed - last_speed_displayed) < 0.005f) // dead-zone if ( (fabsf( speed - last_speed_displayed) < 0.005f) // dead-zone
&& !( speed == 1.f && last_speed_displayed != 1.f) && !( speed == 1.f && last_speed_displayed != 1.f)
@ -299,7 +299,7 @@ ShuttleControl::on_button_press_event (GdkEventButton* ev)
} else { } else {
add_modal_grab (); add_modal_grab ();
shuttle_grabbed = true; shuttle_grabbed = true;
shuttle_speed_on_grab = _session->transport_speed (); shuttle_speed_on_grab = _session->actual_speed ();
requested_speed = shuttle_speed_on_grab; requested_speed = shuttle_speed_on_grab;
mouse_shuttle (ev->x, true); mouse_shuttle (ev->x, true);
gdk_pointer_grab(ev->window,false, gdk_pointer_grab(ev->window,false,
@ -590,7 +590,7 @@ ShuttleControl::render (Cairo::RefPtr<Cairo::Context> const& ctx, cairo_rectangl
char buf[32]; char buf[32];
if (_session) { if (_session) {
speed = _session->transport_speed (); speed = _session->actual_speed ();
acutal_speed = speed; acutal_speed = speed;
if (shuttle_grabbed) { if (shuttle_grabbed) {
speed = requested_speed; speed = requested_speed;
@ -699,7 +699,7 @@ ShuttleControl::parameter_changed (std::string p)
*/ */
if (_session) { if (_session) {
if (_session->transport_rolling()) { if (_session->transport_rolling()) {
if (_session->transport_speed() == 1.0) { if (_session->actual_speed() == 1.0) {
queue_draw (); queue_draw ();
} else { } else {
/* reset current speed and /* reset current speed and