further simplification of midi clock ticker API
git-svn-id: svn://localhost/ardour2/branches/3.0@11361 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
6a999b8287
commit
fc3be1d42c
|
@ -44,9 +44,7 @@ public:
|
||||||
MidiClockTicker ();
|
MidiClockTicker ();
|
||||||
virtual ~MidiClockTicker() {};
|
virtual ~MidiClockTicker() {};
|
||||||
|
|
||||||
void tick (const framepos_t& transport_frames,
|
void tick (const framepos_t& transport_frames);
|
||||||
const Timecode::BBT_Time& transport_bbt,
|
|
||||||
const Timecode::Time& transport_timecode);
|
|
||||||
|
|
||||||
bool has_midi_port() const { return _midi_port != 0; }
|
bool has_midi_port() const { return _midi_port != 0; }
|
||||||
|
|
||||||
|
|
|
@ -89,18 +89,7 @@ Session::process (pframes_t nframes)
|
||||||
|
|
||||||
try {
|
try {
|
||||||
if (Config->get_send_midi_clock() && transport_speed() == 1.0f && midi_clock->has_midi_port()) {
|
if (Config->get_send_midi_clock() && transport_speed() == 1.0f && midi_clock->has_midi_port()) {
|
||||||
|
midi_clock->tick (transport_at_start);
|
||||||
/* As of january 26th 2012, MidiClockTicker::tick()
|
|
||||||
* doesn't actually these variables, so don't waste
|
|
||||||
* cycles computing them.
|
|
||||||
*/
|
|
||||||
|
|
||||||
Timecode::BBT_Time transport_bbt;
|
|
||||||
Timecode::Time transport_timecode;
|
|
||||||
// _tempo_map->bbt_time_rt (transport_at_start, transport_bbt);
|
|
||||||
// timecode_time (transport_at_start, transport_timecode);
|
|
||||||
|
|
||||||
midi_clock->tick (transport_at_start, transport_bbt, transport_timecode);
|
|
||||||
}
|
}
|
||||||
} catch (...) {
|
} catch (...) {
|
||||||
/* don't bother with a message */
|
/* don't bother with a message */
|
||||||
|
|
|
@ -104,7 +104,7 @@ void MidiClockTicker::transport_state_changed()
|
||||||
send_stop_event(0);
|
send_stop_event(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
tick (position, *((Timecode::BBT_Time *) 0), *((Timecode::Time *)0));
|
tick (position);
|
||||||
}
|
}
|
||||||
|
|
||||||
void MidiClockTicker::position_changed (framepos_t position)
|
void MidiClockTicker::position_changed (framepos_t position)
|
||||||
|
@ -130,7 +130,7 @@ void MidiClockTicker::transport_looped()
|
||||||
_last_tick = loop_location->start() - elapsed_since_last_tick;
|
_last_tick = loop_location->start() - elapsed_since_last_tick;
|
||||||
}
|
}
|
||||||
|
|
||||||
void MidiClockTicker::tick (const framepos_t& transport_frames, const Timecode::BBT_Time& /*transport_bbt*/, const Timecode::Time& /*transport_smpt*/)
|
void MidiClockTicker::tick (const framepos_t& transport_frames)
|
||||||
{
|
{
|
||||||
if (!Config->get_send_midi_clock() || _session == 0 || _session->transport_speed() != 1.0f || _midi_port == 0)
|
if (!Config->get_send_midi_clock() || _session == 0 || _session->transport_speed() != 1.0f || _midi_port == 0)
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user