Skeleton tests for BBT_Time.

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

diff --git a/libs/ardour/mtc_slave.cc b/libs/ardour/mtc_slave.cc
index 587d6007b3e2ae7adab2a499c6bfd6ae6a8f2472..4034ef32be3c46be1aa821b1a6552941a85e05e3 100644 (file)
--- a/libs/ardour/mtc_slave.cc
+++ b/libs/ardour/mtc_slave.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2002-4 Paul Davis 
+    Copyright (C) 2002-4 Paul Davis
 
     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
@@ -39,12 +39,12 @@ using namespace sigc;
 using namespace MIDI;
 using namespace PBD;
 
-MTC_Slave::MTC_Slave (Session& s, MIDI::Port& p) 
+MTC_Slave::MTC_Slave (Session& s, MIDI::Port& p)
        : session (s)
 {
        can_notify_on_unknown_rate = true;
 
-       last_mtc_fps_byte = session.get_mtc_smpte_bits ();
+       last_mtc_fps_byte = session.get_mtc_timecode_bits ();
 
        rebind (p);
        reset ();
@@ -76,7 +76,7 @@ MTC_Slave::update_mtc_qtr (Parser& /*p*/)
        nframes_t qtr;
        static cycles_t last_qtr = 0;
 
-       qtr = (long) (session.frames_per_smpte_frame() / 4);
+       qtr = (long) (session.frames_per_timecode_frame() / 4);
        mtc_frame += qtr;
        last_qtr = cnow;
 
@@ -92,85 +92,85 @@ void
 MTC_Slave::update_mtc_time (const byte *msg, bool was_full)
 {
        nframes_t now = session.engine().frame_time();
-       SMPTE::Time smpte;
-       
-       smpte.hours = msg[3];
-       smpte.minutes = msg[2];
-       smpte.seconds = msg[1];
-       smpte.frames = msg[0];
+       Timecode::Time timecode;
+
+       timecode.hours = msg[3];
+       timecode.minutes = msg[2];
+       timecode.seconds = msg[1];
+       timecode.frames = msg[0];
 
        last_mtc_fps_byte = msg[4];
-       
+
        switch (msg[4]) {
        case MTC_24_FPS:
-               smpte.rate = 24;
-               smpte.drop = false;
+               timecode.rate = 24;
+               timecode.drop = false;
                can_notify_on_unknown_rate = true;
                break;
        case MTC_25_FPS:
-               smpte.rate = 25;
-               smpte.drop = false;
+               timecode.rate = 25;
+               timecode.drop = false;
                can_notify_on_unknown_rate = true;
                break;
        case MTC_30_FPS_DROP:
-               smpte.rate = 30;
-               smpte.drop = true;
+               timecode.rate = 30;
+               timecode.drop = true;
                can_notify_on_unknown_rate = true;
                break;
        case MTC_30_FPS:
-               smpte.rate = 30;
-               smpte.drop = false;
+               timecode.rate = 30;
+               timecode.drop = false;
                can_notify_on_unknown_rate = true;
                break;
        default:
                /* throttle error messages about unknown MTC rates */
                if (can_notify_on_unknown_rate) {
                        error << string_compose (_("Unknown rate/drop value %1 in incoming MTC stream, session values used instead"),
-                                                (int) msg[4]) 
+                                                (int) msg[4])
                              << endmsg;
                        can_notify_on_unknown_rate = false;
                }
-               smpte.rate = session.smpte_frames_per_second();
-               smpte.drop = session.smpte_drop_frames();
+               timecode.rate = session.timecode_frames_per_second();
+               timecode.drop = session.timecode_drop_frames();
        }
 
-       session.smpte_to_sample (smpte, mtc_frame, true, false);
-       
+       session.timecode_to_sample (timecode, mtc_frame, true, false);
+
        if (was_full) {
-               
-               current.guard1++;        
-               current.position = mtc_frame;    
-               current.timestamp = 0;   
-               current.guard2++;        
-               
-               session.request_locate (mtc_frame, false);       
+
+               current.guard1++;
+               current.position = mtc_frame;
+               current.timestamp = 0;
+               current.guard2++;
+
+               session.request_locate (mtc_frame, false);
                session.request_transport_speed (0);
-               update_mtc_status (MIDI::Parser::MTC_Stopped);   
+               update_mtc_status (MIDI::Parser::MTC_Stopped);
+
+               reset ();
 
-               reset ();
-               
        } else {
-               
+
                /* We received the last quarter frame 7 quarter frames (1.75 mtc
                   frames) after the instance when the contents of the mtc quarter
                   frames were decided. Add time to compensate for the elapsed 1.75
                   frames.
-                  Also compensate for audio latency. 
+                  Also compensate for audio latency.
                */
 
-               mtc_frame += (long) (1.75 * session.frames_per_smpte_frame()) + session.worst_output_latency();
-               
+               mtc_frame += (long) (1.75 * session.frames_per_timecode_frame()) + session.worst_output_latency();
+
                if (first_mtc_frame == 0) {
                        first_mtc_frame = mtc_frame;
                        first_mtc_time = now;
-               } 
-               
+               }
+
                current.guard1++;
                current.position = mtc_frame;
                current.timestamp = now;
                current.guard2++;
        }
-       
+
        last_inbound_frame = now;
 }
 
@@ -178,7 +178,7 @@ void
 MTC_Slave::handle_locate (const MIDI::byte* mmc_tc)
 {
        MIDI::byte mtc[5];
-       
+
        mtc[4] = last_mtc_fps_byte;
        mtc[3] = mmc_tc[0] & 0xf; /* hrs only */
        mtc[2] = mmc_tc[1];
@@ -257,7 +257,7 @@ MTC_Slave::ok() const
        return true;
 }
 
-bool 
+bool
 MTC_Slave::speed_and_position (double& speed, nframes_t& pos)
 {
        nframes_t now = session.engine().frame_time();
@@ -273,7 +273,7 @@ MTC_Slave::speed_and_position (double& speed, nframes_t& pos)
                pos = last.position;
                return true;
        }
-       
+
        /* no timecode for 1/4 second ? conclude that its stopped */
 
        if (last_inbound_frame && now > last_inbound_frame && now - last_inbound_frame > session.frame_rate() / 4) {
@@ -317,9 +317,9 @@ MTC_Slave::speed_and_position (double& speed, nframes_t& pos)
                elapsed = 0;
 
        } else {
-       
+
                /* scale elapsed time by the current MTC speed */
-               
+
                if (last.timestamp && (now > last.timestamp)) {
                        elapsed = (nframes_t) floor (mtc_speed * (now - last.timestamp));
                } else {
@@ -338,7 +338,7 @@ MTC_Slave::speed_and_position (double& speed, nframes_t& pos)
 ARDOUR::nframes_t
 MTC_Slave::resolution() const
 {
-       return (nframes_t) session.frames_per_smpte_frame();
+       return (nframes_t) session.frames_per_timecode_frame();
 }
 
 void
@@ -348,9 +348,9 @@ MTC_Slave::reset ()
           be being updated as we call this. but this
           supposed to be a realtime-safe call.
        */
-       
+
        port->input()->reset_mtc_state ();
-       
+
        last_inbound_frame = 0;
        current.guard1++;
        current.position = 0;