get Delivery to disconnect from any signals it is connected to relatively early in...

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

diff --git a/libs/ardour/ticker.cc b/libs/ardour/ticker.cc
index 0b4e64e0df3917e75c44adb1e942c0acf9865a0b..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"
@@ -52,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()
@@ -74,7 +75,7 @@ void MidiClockTicker::transport_state_changed()
        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;
 
@@ -156,10 +157,7 @@ void MidiClockTicker::tick (const framepos_t& transport_frames, const Timecode::
 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;
@@ -184,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);
 }
@@ -194,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);
 }
@@ -204,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);
 }