summaryrefslogtreecommitdiff
path: root/libs/ardour/ticker.cc
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2009-10-21 22:25:46 +0000
committerDavid Robillard <d@drobilla.net>2009-10-21 22:25:46 +0000
commit24035e24e8a13ae3262230c041752fe7c50fdcd9 (patch)
treec874490b0559b98c8b5c5902b6fcbd3875980bee /libs/ardour/ticker.cc
parent4b01242df13846610a08f7a4d1327cd6ee96063f (diff)
Fix compilation with -DDEBUG_MIDI_CLOCK
git-svn-id: svn://localhost/ardour2/branches/3.0@5851 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ticker.cc')
-rw-r--r--libs/ardour/ticker.cc25
1 files changed, 17 insertions, 8 deletions
diff --git a/libs/ardour/ticker.cc b/libs/ardour/ticker.cc
index 6f831e8808..19f5ed195d 100644
--- a/libs/ardour/ticker.cc
+++ b/libs/ardour/ticker.cc
@@ -22,6 +22,11 @@
#include "ardour/session.h"
#include "ardour/tempo.h"
+#ifdef DEBUG_MIDI_CLOCK
+#include <iostream>
+using namespace std;
+#endif
+
namespace ARDOUR
{
@@ -30,7 +35,7 @@ void Ticker::set_session(Session& s)
{
_session = &s;
- if(_session) {
+ if (_session) {
_session->tick.connect(mem_fun (*this, &Ticker::tick));
_session->GoingAway.connect(mem_fun (*this, &Ticker::going_away));
}
@@ -40,11 +45,15 @@ 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));
+ 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));
update_midi_clock_port();
}
}
@@ -61,8 +70,8 @@ void MidiClockTicker::transport_state_changed()
return;
}
- float speed = _session->transport_speed();
- nframes_t position = _session->transport_frame();
+ float speed = _session->transport_speed();
+ nframes_t position = _session->transport_frame();
#ifdef DEBUG_MIDI_CLOCK
cerr << "Transport state change, speed:" << speed << "position:" << position<< " play loop " << _session->get_play_loop() << endl;
#endif