ardour/livetrax
13
0
Fork 0
Code

further simplification of midi clock ticker API

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@11361 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-01-27 13:27:01 +00:00
parent 6a999b8287
commit fc3be1d42c
3 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/ardour/ardour/ticker.h
View File

@ -44,9 +44,7 @@ public:
MidiClockTicker ();
virtual ~MidiClockTicker() {};
void tick (const framepos_t& transport_frames,
const Timecode::BBT_Time& transport_bbt,
const Timecode::Time& transport_timecode);
void tick (const framepos_t& transport_frames);
bool has_midi_port() const { return _midi_port != 0; }

13
libs/ardour/session_process.cc
View File

@ -89,18 +89,7 @@ Session::process (pframes_t nframes)
try {
if (Config->get_send_midi_clock() && transport_speed() == 1.0f && midi_clock->has_midi_port()) {
/* 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);
midi_clock->tick (transport_at_start);
}
} catch (...) {
/* don't bother with a message */

4
libs/ardour/ticker.cc
View File

@ -104,7 +104,7 @@ void MidiClockTicker::transport_state_changed()
send_stop_event(0);
}
tick (position, *((Timecode::BBT_Time *) 0), *((Timecode::Time *)0));
tick (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;
}
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)
return;