Tweak colouring in the processor list.

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

diff --git a/libs/ardour/mtc_slave.cc b/libs/ardour/mtc_slave.cc
index a67bb7481d122dab27e391ed405897ab127ab57b..9564770f7f95ba7bdfc0431cf95fad198fb1782f 100644 (file)
--- a/libs/ardour/mtc_slave.cc
+++ b/libs/ardour/mtc_slave.cc
@@ -101,7 +101,7 @@ MTC_Slave::rebind (MIDI::Port& p)
 }
 
 void
-MTC_Slave::update_mtc_qtr (Parser& /*p*/, int which_qtr, nframes_t now)
+MTC_Slave::update_mtc_qtr (Parser& /*p*/, int which_qtr, framepos_t now)
 {
        DEBUG_TRACE (DEBUG::MTC, string_compose ("qtr frame %1 at %2\n", which_qtr, now));
        maybe_reset ();
@@ -109,7 +109,7 @@ MTC_Slave::update_mtc_qtr (Parser& /*p*/, int which_qtr, nframes_t now)
 }
 
 void
-MTC_Slave::update_mtc_time (const byte *msg, bool was_full, nframes_t now)
+MTC_Slave::update_mtc_time (const byte *msg, bool was_full, framepos_t now)
 {
        /* "now" can be zero if this is called from a context where we do not have or do not want
           to use a timestamp indicating when this MTC time was received. example: when we received
@@ -123,7 +123,7 @@ MTC_Slave::update_mtc_time (const byte *msg, bool was_full, nframes_t now)
        Timecode::Time timecode;
        TimecodeFormat tc_format;
        bool reset_tc = true;
-       nframes64_t window_root = -1;
+       framepos_t window_root = -1;
 
        DEBUG_TRACE (DEBUG::MTC, string_compose ("full mtc time known at %1, full ? %2\n", now, was_full));
        
@@ -230,8 +230,8 @@ MTC_Slave::update_mtc_time (const byte *msg, bool was_full, nframes_t now)
                                         * its not the average, but we will assign it to current.speed below
                                         */
 
-                                   static nframes64_t last_seen_timestamp = 0; 
-                                   static nframes64_t last_seen_position = 0; 
+                                   static framepos_t last_seen_timestamp = 0; 
+                                   static framepos_t last_seen_position = 0; 
 
                                    if ((now - last_seen_timestamp) < 300) {
                                        mtc_frame = (mtc_frame + last_seen_position)/2;
@@ -247,7 +247,7 @@ MTC_Slave::update_mtc_time (const byte *msg, bool was_full, nframes_t now)
                                        /* Non-PiC 
                                         */
 
-                                       nframes64_t time_delta = (now - last_mtc_timestamp);
+                                       framepos_t time_delta = (now - last_mtc_timestamp);
                                        
                                        if (time_delta != 0) {
                                                double apparent_speed = (mtc_frame - last_mtc_frame) / (double) (time_delta);
@@ -391,11 +391,11 @@ MTC_Slave::ok() const
 }
 
 bool
-MTC_Slave::speed_and_position (double& speed, nframes64_t& pos)
+MTC_Slave::speed_and_position (double& speed, framepos_t& pos)
 {
-       nframes64_t now = session.engine().frame_time();
+       framepos_t now = session.engine().frame_time();
        SafeTime last;
-       nframes_t elapsed;
+       framecnt_t elapsed;
        bool in_control = false;
 
        read_current (&last);
@@ -423,12 +423,12 @@ MTC_Slave::speed_and_position (double& speed, nframes64_t& pos)
 
        if (give_slave_full_control_over_transport_speed()) {
                in_control = (session.slave_state() == Session::Running);
-               nframes64_t pic_want_locate = 0; 
-               //nframes64_t slave_pos = session.audible_frame();
-               nframes64_t slave_pos = session.transport_frame();
+               framepos_t pic_want_locate = 0; 
+               //framepos_t slave_pos = session.audible_frame();
+               framepos_t slave_pos = session.transport_frame();
                static double average_speed = 0;
                
-               nframes64_t ref_now = session.engine().frame_time_at_cycle_start();
+               framepos_t ref_now = session.engine().frame_time_at_cycle_start();
                average_speed = pic->get_ratio (last.timestamp, last.position, ref_now, slave_pos, in_control, session.engine().frames_per_cycle());
   
                pic_want_locate = pic->want_locate();
@@ -450,7 +450,7 @@ MTC_Slave::speed_and_position (double& speed, nframes64_t& pos)
                /* scale elapsed time by the current MTC speed */
 
                if (last.timestamp && (now > last.timestamp)) {
-                       elapsed = (nframes_t) floor (last.speed * (now - last.timestamp));
+                       elapsed = (framecnt_t) floor (last.speed * (now - last.timestamp));
                        DEBUG_TRACE (DEBUG::MTC, string_compose ("last timecode received @ %1, now = %2, elapsed frames = %3 w/speed= %4\n",
                                                                 last.timestamp, now, elapsed, last.speed));
                } else {
@@ -476,10 +476,10 @@ MTC_Slave::speed_and_position (double& speed, nframes64_t& pos)
        return true;
 }
 
-ARDOUR::nframes_t
-MTC_Slave::resolution() const
+ARDOUR::framecnt_t
+MTC_Slave::resolution () const
 {
-       return (nframes_t) session.frames_per_timecode_frame();
+       return (framecnt_t) session.frames_per_timecode_frame();
 }
 
 void
@@ -535,7 +535,7 @@ MTC_Slave::reset (bool with_position)
 }
 
 void
-MTC_Slave::reset_window (nframes64_t root)
+MTC_Slave::reset_window (framepos_t root)
 {
        
        /* if we're waiting for the master to catch us after seeking ahead, keep the window
@@ -555,7 +555,7 @@ MTC_Slave::reset_window (nframes64_t root)
 
        case MTC_Backward:
                if (session.slave_state() == Session::Running) {
-                       nframes_t d = session.frames_per_timecode_frame() * frame_tolerance;
+                       framecnt_t const d = session.frames_per_timecode_frame() * frame_tolerance;
                        if (root > d) {
                                window_begin = root - d;
                                window_end = root;
@@ -563,7 +563,7 @@ MTC_Slave::reset_window (nframes64_t root)
                                window_begin = 0;
                        }
                } else {
-                       nframes_t d = seekahead_distance ();
+                       framecnt_t const d = seekahead_distance ();
                        if (root > d) {
                                window_begin = root - d;
                        } else {
@@ -581,7 +581,7 @@ MTC_Slave::reset_window (nframes64_t root)
        DEBUG_TRACE (DEBUG::MTC, string_compose ("legal MTC window now %1 .. %2\n", window_begin, window_end));
 }
 
-nframes64_t
+ARDOUR::framecnt_t
 MTC_Slave::seekahead_distance () const
 {
        /* 1 second */
@@ -589,7 +589,7 @@ MTC_Slave::seekahead_distance () const
 }
 
 bool
-MTC_Slave::outside_window (nframes64_t pos) const
+MTC_Slave::outside_window (framepos_t pos) const
 {
        return ((pos < window_begin) || (pos > window_end));
 }