In export format dialog, show preview of generated part of description. Fix to #0004941

[ardour.git] / libs / ardour / ardour / slave.h

diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h
index 45ab00a44f6088698e7df58e0a207c2ac9bba459..a487824e519262c6b539049d258d33102e5348e1 100644 (file)
--- a/libs/ardour/ardour/slave.h
+++ b/libs/ardour/ardour/slave.h
@@ -23,7 +23,6 @@
 #include <vector>
 
 #include <glibmm/thread.h>
-#include <boost/signals2.hpp>
 
 #include <jack/jack.h>
 
@@ -156,7 +155,7 @@ class Slave {
         * only if requires_seekahead() returns true.
         */
 
-       virtual framepos_t seekahead_distance() const { return 0; }
+       virtual framecnt_t seekahead_distance() const { return 0; }
 
        /**
         * @return - when returning true, ARDOUR will use transport speed 1.0 no matter what
@@ -207,19 +206,19 @@ class SlaveSessionProxy : public ISlaveSessionProxy {
 };
 
 struct SafeTime {
-    volatile int guard1;
-    framepos_t  position;
-    framepos_t  timestamp;
-    double       speed;
-    volatile int guard2;
-    
-    SafeTime() {
-           guard1 = 0;
-           position = 0;
-           timestamp = 0;
-           speed = 0;
-           guard2 = 0;
-    }
+       volatile int guard1;
+       framepos_t   position;
+       framepos_t   timestamp;
+       double       speed;
+       volatile int guard2;
+
+       SafeTime() {
+               guard1 = 0;
+               position = 0;
+               timestamp = 0;
+               speed = 0;
+               guard2 = 0;
+       }
 };
 
 class MTC_Slave : public Slave {
@@ -236,7 +235,7 @@ class MTC_Slave : public Slave {
 
        framecnt_t resolution () const;
        bool requires_seekahead () const { return true; }
-       framepos_t seekahead_distance() const;
+       framecnt_t seekahead_distance() const;
        bool give_slave_full_control_over_transport_speed() const;
 
   private: