summaryrefslogtreecommitdiff
path: root/libs/ardour/ticker.cc
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2009-10-14 16:10:01 +0000
committerDavid Robillard <d@drobilla.net>2009-10-14 16:10:01 +0000
commitbb9cc45cd22af67ac275a5e73accbe14fee664d8 (patch)
treee52977d3eae6ff07b856088041a080a2fa3e5b79 /libs/ardour/ticker.cc
parent8c4ce1e2ce35571aed5a686671431fdfffae7f8c (diff)
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only.
Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ticker.cc')
-rw-r--r--libs/ardour/ticker.cc72
1 files changed, 36 insertions, 36 deletions
diff --git a/libs/ardour/ticker.cc b/libs/ardour/ticker.cc
index de42683c15..6f831e8808 100644
--- a/libs/ardour/ticker.cc
+++ b/libs/ardour/ticker.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2008 Hans Baier
+ Copyright (C) 2008 Hans Baier
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -26,25 +26,25 @@ namespace ARDOUR
{
-void Ticker::set_session(Session& s)
+void Ticker::set_session(Session& s)
{
_session = &s;
-
+
if(_session) {
_session->tick.connect(mem_fun (*this, &Ticker::tick));
_session->GoingAway.connect(mem_fun (*this, &Ticker::going_away));
}
}
-void MidiClockTicker::set_session(Session& s)
+void MidiClockTicker::set_session(Session& s)
{
Ticker::set_session(s);
-
+
if(_session) {
_session->MIDIClock_PortChanged.connect(mem_fun (*this, &MidiClockTicker::update_midi_clock_port));
_session->TransportStateChange .connect(mem_fun (*this, &MidiClockTicker::transport_state_changed));
- _session->PositionChanged .connect(mem_fun (*this, &MidiClockTicker::position_changed));
- _session->TransportLooped .connect(mem_fun (*this, &MidiClockTicker::transport_looped));
+ _session->PositionChanged .connect(mem_fun (*this, &MidiClockTicker::position_changed));
+ _session->TransportLooped .connect(mem_fun (*this, &MidiClockTicker::transport_looped));
update_midi_clock_port();
}
}
@@ -60,18 +60,18 @@ void MidiClockTicker::transport_state_changed()
/* no midi clock during export, for now */
return;
}
-
+
float speed = _session->transport_speed();
nframes_t position = _session->transport_frame();
-#ifdef DEBUG_MIDI_CLOCK
+#ifdef DEBUG_MIDI_CLOCK
cerr << "Transport state change, speed:" << speed << "position:" << position<< " play loop " << _session->get_play_loop() << endl;
-#endif
+#endif
if (speed == 1.0f) {
_last_tick = position;
-
- if (!Config->get_send_midi_clock())
+
+ if (!Config->get_send_midi_clock())
return;
-
+
if (_session->get_play_loop()) {
assert(_session->locations()->auto_loop_location());
if (position == _session->locations()->auto_loop_location()->start()) {
@@ -84,24 +84,24 @@ void MidiClockTicker::transport_state_changed()
} else {
send_continue_event(0);
}
-
+
send_midi_clock_event(0);
-
+
} else if (speed == 0.0f) {
- if (!Config->get_send_midi_clock())
+ if (!Config->get_send_midi_clock())
return;
-
+
send_stop_event(0);
}
-
+
tick(position, *((ARDOUR::BBT_Time *) 0), *((SMPTE::Time *)0));
}
void MidiClockTicker::position_changed(nframes_t position)
{
-#ifdef DEBUG_MIDI_CLOCK
+#ifdef DEBUG_MIDI_CLOCK
cerr << "Position changed:" << position << endl;
-#endif
+#endif
_last_tick = position;
}
@@ -110,15 +110,15 @@ void MidiClockTicker::transport_looped()
Location* loop_location = _session->locations()->auto_loop_location();
assert(loop_location);
-#ifdef DEBUG_MIDI_CLOCK
+#ifdef DEBUG_MIDI_CLOCK
cerr << "Transport looped, position:" << _session->transport_frame()
<< " loop start " << loop_location->start( )
<< " loop end " << loop_location->end( )
<< " play loop " << _session->get_play_loop()
<< endl;
#endif
-
- // adjust _last_tick, so that the next MIDI clock message is sent
+
+ // adjust _last_tick, so that the next MIDI clock message is sent
// in due time (and the tick interval is still constant)
nframes_t elapsed_since_last_tick = loop_location->end() - _last_tick;
_last_tick = loop_location->start() - elapsed_since_last_tick;
@@ -132,25 +132,25 @@ void MidiClockTicker::tick(const nframes_t& transport_frames, const BBT_Time& /*
MIDI::JACK_MidiPort* jack_port = dynamic_cast<MIDI::JACK_MidiPort*>(_midi_port);
assert(jack_port);
-
+
while (true) {
double next_tick = _last_tick + one_ppqn_in_frames(transport_frames);
nframes_t next_tick_offset = nframes_t(next_tick) - transport_frames;
-
-#ifdef DEBUG_MIDI_CLOCK
- cerr << "Transport:" << transport_frames
- << ":Last tick time:" << _last_tick << ":"
- << ":Next tick time:" << next_tick << ":"
+
+#ifdef DEBUG_MIDI_CLOCK
+ cerr << "Transport:" << transport_frames
+ << ":Last tick time:" << _last_tick << ":"
+ << ":Next tick time:" << next_tick << ":"
<< "Offset:" << next_tick_offset << ":"
- << "cycle length:" << jack_port->nframes_this_cycle()
- << endl;
-#endif
-
+ << "cycle length:" << jack_port->nframes_this_cycle()
+ << endl;
+#endif
+
if (next_tick_offset >= jack_port->nframes_this_cycle())
return;
-
+
send_midi_clock_event(next_tick_offset);
-
+
_last_tick = next_tick;
}
#endif // WITH_JACK_MIDI
@@ -175,7 +175,7 @@ void MidiClockTicker::send_midi_clock_event(nframes_t offset)
#ifdef WITH_JACK_MIDI
assert (MIDI::JACK_MidiPort::is_process_thread());
#endif // WITH_JACK_MIDI
-#ifdef DEBUG_MIDI_CLOCK
+#ifdef DEBUG_MIDI_CLOCK
cerr << "Tick with offset " << offset << endl;
#endif // DEBUG_MIDI_CLOCK
static uint8_t _midi_clock_tick[1] = { MIDI_CMD_COMMON_CLOCK };