restore ability to create TOC and CUE files during export. this is an option in a...

[ardour.git] / libs / ardour / ticker.cc

diff --git a/libs/ardour/ticker.cc b/libs/ardour/ticker.cc
index 4fbc18bd1fc7b43f5f1236178dcfcf28ba4a7487..e53d31bff8f5ec791cf16c99142178f722a23730 100644 (file)
--- a/libs/ardour/ticker.cc
+++ b/libs/ardour/ticker.cc
@@ -18,6 +18,7 @@
     $Id$
 */
 
+#include "pbd/compose.h"
 #include "midi++/port.h"
 #include "midi++/manager.h"
 #include "evoral/midi_events.h"
@@ -26,11 +27,6 @@
 #include "ardour/tempo.h"
 #include "ardour/debug.h"
 
-#ifdef DEBUG_MIDI_CLOCK
-#include <iostream>
-using namespace std;
-#endif
-
 using namespace ARDOUR;
 
 void Ticker::set_session (Session* s)
@@ -57,8 +53,8 @@ void MidiClockTicker::set_session (Session* s)
 void
 MidiClockTicker::session_going_away ()
 {
-       SessionHandlePtr::session_going_away(); 
-       _midi_port = 0; 
+       SessionHandlePtr::session_going_away();
+       _midi_port = 0;
 }
 
 void MidiClockTicker::update_midi_clock_port()
@@ -75,9 +71,11 @@ void MidiClockTicker::transport_state_changed()
 
        float      speed    = _session->transport_speed();
        framepos_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
+
+       DEBUG_TRACE (PBD::DEBUG::MidiClock,
+                    string_compose ("Transport state change, speed: %1 position: %2 play loop: %3\n", speed, position, _session->get_play_loop())
+               );
+
        if (speed == 1.0f) {
                _last_tick = position;
 
@@ -106,14 +104,13 @@ void MidiClockTicker::transport_state_changed()
                send_stop_event(0);
        }
 
-       tick(position, *((ARDOUR::BBT_Time *) 0), *((Timecode::Time *)0));
+       tick(position, *((Timecode::BBT_Time *) 0), *((Timecode::Time *)0));
 }
 
 void MidiClockTicker::position_changed (framepos_t position)
 {
-#ifdef DEBUG_MIDI_CLOCK
-       cerr << "Position changed:" << position << endl;
-#endif
+       DEBUG_TRACE (PBD::DEBUG::MidiClock, string_compose ("Position change: %1\n", position));
+
        _last_tick = position;
 }
 
@@ -122,13 +119,10 @@ void MidiClockTicker::transport_looped()
        Location* loop_location = _session->locations()->auto_loop_location();
        assert(loop_location);
 
-#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
+       DEBUG_TRACE (PBD::DEBUG::MidiClock,
+                    string_compose ("Transport looped, position: %1, loop start: %2, loop end: %3, play loop: %4\n",
+                                    _session->transport_frame(), loop_location->start(), loop_location->end(), _session->get_play_loop())
+               );
 
        // adjust _last_tick, so that the next MIDI clock message is sent
        // in due time (and the tick interval is still constant)
@@ -136,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 BBT_Time& /*transport_bbt*/, const Timecode::Time& /*transport_smpt*/)
+void MidiClockTicker::tick (const framepos_t& transport_frames, const Timecode::BBT_Time& /*transport_bbt*/, const Timecode::Time& /*transport_smpt*/)
 {
        if (!Config->get_send_midi_clock() || _session == 0 || _session->transport_speed() != 1.0f || _midi_port == 0)
                return;
@@ -145,14 +139,11 @@ void MidiClockTicker::tick (const framepos_t& transport_frames, const BBT_Time&
                double next_tick = _last_tick + one_ppqn_in_frames(transport_frames);
                framecnt_t next_tick_offset = framecnt_t(next_tick) - transport_frames;
 
-#ifdef DEBUG_MIDI_CLOCK
-               cerr << "Transport:" << transport_frames
-                        << ":Last tick time:" << _last_tick << ":"
-                        << ":Next tick time:" << next_tick << ":"
-                        << "Offset:" << next_tick_offset << ":"
-                        << "cycle length:" << _midi_port->nframes_this_cycle()
-                        << endl;
-#endif
+               DEBUG_TRACE (PBD::DEBUG::MidiClock,
+                            string_compose ("Transport: %1, last tick time: %2, next tick time: %3, offset: %4, cycle length: %5\n",
+                                            transport_frames, _last_tick, next_tick, next_tick_offset, _midi_port->nframes_this_cycle()
+                                    )
+                       );
 
                if (next_tick_offset >= _midi_port->nframes_this_cycle())
                        return;
@@ -166,10 +157,7 @@ void MidiClockTicker::tick (const framepos_t& transport_frames, const BBT_Time&
 double MidiClockTicker::one_ppqn_in_frames (framepos_t transport_position)
 {
        const Tempo& current_tempo = _session->tempo_map().tempo_at(transport_position);
-       const Meter& current_meter = _session->tempo_map().meter_at(transport_position);
-       double frames_per_beat =
-               current_tempo.frames_per_beat(_session->nominal_frame_rate(),
-                                             current_meter);
+       double frames_per_beat = current_tempo.frames_per_beat(_session->nominal_frame_rate());
 
        double quarter_notes_per_beat = 4.0 / current_tempo.note_type();
        double frames_per_quarter_note = frames_per_beat / quarter_notes_per_beat;
@@ -183,7 +171,7 @@ void MidiClockTicker::send_midi_clock_event (pframes_t offset)
                return;
        }
 
-       DEBUG_TRACE (PBD::DEBUG::MidiClock, string_compose ("Tick with offset %1", offset));
+       DEBUG_TRACE (PBD::DEBUG::MidiClock, string_compose ("Tick with offset %1\n", offset));
 
        static uint8_t _midi_clock_tick[1] = { MIDI_CMD_COMMON_CLOCK };
        _midi_port->write (_midi_clock_tick, 1, offset);
@@ -194,7 +182,7 @@ void MidiClockTicker::send_start_event (pframes_t offset)
        if (!_midi_port) {
                return;
        }
-       
+
        static uint8_t _midi_clock_tick[1] = { MIDI_CMD_COMMON_START };
        _midi_port->write (_midi_clock_tick, 1, offset);
 }
@@ -204,7 +192,7 @@ void MidiClockTicker::send_continue_event (pframes_t offset)
        if (!_midi_port) {
                return;
        }
-       
+
        static uint8_t _midi_clock_tick[1] = { MIDI_CMD_COMMON_CONTINUE };
        _midi_port->write (_midi_clock_tick, 1, offset);
 }
@@ -214,7 +202,7 @@ void MidiClockTicker::send_stop_event (pframes_t offset)
        if (!_midi_port) {
                return;
        }
-       
+
        static uint8_t _midi_clock_tick[1] = { MIDI_CMD_COMMON_STOP };
        _midi_port->write (_midi_clock_tick, 1, offset);
 }