diff options
| author | Johannes Mueller <github@johannes-mueller.org> | 2019-05-18 16:36:49 +0200 |
|---|---|---|
| committer | Johannes Mueller <github@johannes-mueller.org> | 2019-05-18 16:36:49 +0200 |
| commit | 0c3112aed13421736cde3da02e5ce5600d902570 (patch) | |
| tree | 5b9e19a584ead1aa9c11b8fb90bad1b09f687808 /libs/surfaces/us2400 | |
| parent | b8349069f11db36f13065c55e0eb4e6b5c3fe727 (diff) | |
Some frame -> sample changes in UCS2400
Diffstat (limited to 'libs/surfaces/us2400')
| -rw-r--r-- | libs/surfaces/us2400/mcp_buttons.cc | 4 | ||||
| -rw-r--r-- | libs/surfaces/us2400/strip.cc | 8 | ||||
| -rw-r--r-- | libs/surfaces/us2400/us2400_control_protocol.cc | 4 | ||||
| -rw-r--r-- | libs/surfaces/us2400/us2400_control_protocol.h | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/libs/surfaces/us2400/mcp_buttons.cc b/libs/surfaces/us2400/mcp_buttons.cc index 4e6aa46ed4..115f9d8867 100644 --- a/libs/surfaces/us2400/mcp_buttons.cc +++ b/libs/surfaces/us2400/mcp_buttons.cc @@ -853,7 +853,7 @@ US2400Protocol::master_fader_touch_press (US2400::Button &) boost::shared_ptr<AutomationControl> ac = master_fader->control (); master_fader->set_in_use (true); - master_fader->start_touch (transport_frame()); + master_fader->start_touch (transport_sample()); return none; } @@ -865,7 +865,7 @@ US2400Protocol::master_fader_touch_release (US2400::Button &) Fader* master_fader = _master_surface->master_fader(); master_fader->set_in_use (false); - master_fader->stop_touch (transport_frame()); + master_fader->stop_touch (transport_sample()); return none; } diff --git a/libs/surfaces/us2400/strip.cc b/libs/surfaces/us2400/strip.cc index 8298ff3a93..4fdf72e360 100644 --- a/libs/surfaces/us2400/strip.cc +++ b/libs/surfaces/us2400/strip.cc @@ -429,12 +429,12 @@ Strip::fader_touch_event (Button&, ButtonState bs) boost::shared_ptr<AutomationControl> ac = _fader->control (); _fader->set_in_use (true); - _fader->start_touch (_surface->mcp().transport_frame()); + _fader->start_touch (_surface->mcp().transport_sample()); } else { _fader->set_in_use (false); - _fader->stop_touch (_surface->mcp().transport_frame()); + _fader->stop_touch (_surface->mcp().transport_sample()); } } @@ -510,9 +510,9 @@ void Strip::handle_fader_touch (Fader& fader, bool touch_on) { if (touch_on) { - fader.start_touch (_surface->mcp().transport_frame()); + fader.start_touch (_surface->mcp().transport_sample()); } else { - fader.stop_touch (_surface->mcp().transport_frame()); + fader.stop_touch (_surface->mcp().transport_sample()); } } diff --git a/libs/surfaces/us2400/us2400_control_protocol.cc b/libs/surfaces/us2400/us2400_control_protocol.cc index e6d54819f1..a23790c491 100644 --- a/libs/surfaces/us2400/us2400_control_protocol.cc +++ b/libs/surfaces/us2400/us2400_control_protocol.cc @@ -111,7 +111,7 @@ US2400Protocol::US2400Protocol (Session& session) : ControlProtocol (session, X_("Tascam US-2400")) , AbstractUI<US2400ControlUIRequest> (name()) , _current_initial_bank (0) - , _frame_last (0) + , _sample_last (0) , _timecode_type (ARDOUR::AnyTime::BBT) , _gui (0) , _scrub_mode (false) @@ -1510,7 +1510,7 @@ US2400Protocol::update_fader_automation_state () } samplepos_t -US2400Protocol::transport_frame() const +US2400Protocol::transport_sample() const { return session->transport_sample(); } diff --git a/libs/surfaces/us2400/us2400_control_protocol.h b/libs/surfaces/us2400/us2400_control_protocol.h index 415b42ad08..201927bbcb 100644 --- a/libs/surfaces/us2400/us2400_control_protocol.h +++ b/libs/surfaces/us2400/us2400_control_protocol.h @@ -199,7 +199,7 @@ class US2400Protocol void update_global_led (int id, US2400::LedState); ARDOUR::Session & get_session() { return *session; } - samplepos_t transport_frame() const; + samplepos_t transport_sample() const; int modifier_state() const { return _modifier_state; } int main_modifier_state() const { return _modifier_state & MAIN_MODIFIER_MASK; } @@ -281,7 +281,7 @@ class US2400Protocol US2400::Timer _frm_left_last; // last written timecode string std::string _timecode_last; - samplepos_t _frame_last; + samplepos_t _sample_last; // Which timecode are we displaying? BBT or Timecode ARDOUR::AnyTime::Type _timecode_type; // Bundle to represent our input ports |