diff options
Diffstat (limited to 'libs/surfaces/faderport8/actions.cc')
| -rw-r--r-- | libs/surfaces/faderport8/actions.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libs/surfaces/faderport8/actions.cc b/libs/surfaces/faderport8/actions.cc index d17059d92d..07496e9912 100644 --- a/libs/surfaces/faderport8/actions.cc +++ b/libs/surfaces/faderport8/actions.cc @@ -332,7 +332,7 @@ FaderPort8::button_solo_clear () if (!ac) { continue; } - ac->start_touch (ac->session().transport_frame()); + ac->start_touch (ac->session().transport_sample()); cl->push_back (ac); } if (!cl->empty()) { @@ -357,7 +357,7 @@ FaderPort8::button_mute_clear () continue; } cl->push_back (ac); - ac->start_touch (ac->session().transport_frame()); + ac->start_touch (ac->session().transport_sample()); } if (!cl->empty()) { session->set_controls (cl, 1.0, PBD::Controllable::NoGroup); @@ -397,7 +397,7 @@ FaderPort8::handle_encoder_pan (int steps) ac = s->pan_azimuth_control (); } if (ac) { - ac->start_touch (ac->session().transport_frame()); + ac->start_touch (ac->session().transport_sample()); if (steps == 0) { ac->set_value (ac->normal(), PBD::Controllable::UseGroup); } else { @@ -421,7 +421,7 @@ FaderPort8::handle_encoder_link (int steps) } double v = ac->internal_to_interface (ac->get_value()); - ac->start_touch (ac->session().transport_frame()); + ac->start_touch (ac->session().transport_sample()); if (steps == 0) { ac->set_value (ac->normal(), PBD::Controllable::UseGroup); @@ -528,7 +528,7 @@ FaderPort8::button_encoder () ac = session->master_out()->gain_control (); } if (ac) { - ac->start_touch (ac->session().transport_frame()); + ac->start_touch (ac->session().transport_sample()); ac->set_value (ac->normal(), PBD::Controllable::NoGroup); } } @@ -542,8 +542,8 @@ FaderPort8::button_encoder () /* Don't add another mark if one exists within 1/100th of a second of * the current position and we're not rolling. */ - framepos_t where = session->audible_frame(); - if (session->transport_stopped() && session->locations()->mark_at (where, session->frame_rate() / 100.0)) { + samplepos_t where = session->audible_sample(); + if (session->transport_stopped() && session->locations()->mark_at (where, session->sample_rate() / 100.0)) { return; } @@ -608,7 +608,7 @@ FaderPort8::encoder_navigate (bool neg, int steps) if (ac) { double v = ac->internal_to_interface (ac->get_value()); v = std::max (0.0, std::min (1.0, v + steps * (neg ? -.01 : .01))); - ac->start_touch (ac->session().transport_frame()); + ac->start_touch (ac->session().transport_sample()); ac->set_value (ac->interface_to_internal(v), PBD::Controllable::NoGroup); } } |