ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Some frame -> sample changes in UCS2400

This commit is contained in:
Johannes Mueller 2019-05-18 16:36:49 +02:00
parent b8349069f1
commit 0c3112aed1
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/surfaces/us2400/mcp_buttons.cc
View File

@ -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;
}

8
libs/surfaces/us2400/strip.cc
View File

@ -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());
}
}

4
libs/surfaces/us2400/us2400_control_protocol.cc
View File

@ -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();
}

4
libs/surfaces/us2400/us2400_control_protocol.h
View File

@ -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