Merge branch 'master' into windows

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

diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h
index 1d8a7dd965e84ff56320c0feaf61e0260e150ab9..ca3f618af1de1ed5363d6f971a12b73cc86a91f5 100644 (file)
--- a/libs/ardour/ardour/slave.h
+++ b/libs/ardour/ardour/slave.h
@@ -25,11 +25,11 @@
 #include <glibmm/threads.h>
 
 #include <jack/jack.h>
+#include <ltc.h>
 
 #include "pbd/signals.h"
 
 #include "timecode/time.h"
-#include "ltc/ltc.h"
 
 #include "ardour/types.h"
 #include "midi++/parser.h"
@@ -64,15 +64,6 @@ class Slave {
        Slave() { }
        virtual ~Slave() {}
 
-        /** The slave should read any incoming information in this method
-        *  and use it adjust its current idea of reality. If no such
-        *  processing is required, it does need to be implemented.
-        *
-        * @param nframes specifies the number of frames-worth of data that
-        * can be read from any ports used by the slave.
-        */
-         virtual int process (pframes_t) { return 0; }
-
        /**
         * This is the most important function to implement:
         * Each process cycle, Session::follow_slave will call this method.
@@ -263,7 +254,6 @@ class MTC_Slave : public TimecodeSlave {
        ~MTC_Slave ();
 
        void rebind (MidiPort&);
-        int process (pframes_t);
        bool speed_and_position (double&, framepos_t&);
 
        bool locked() const;
@@ -282,7 +272,6 @@ class MTC_Slave : public TimecodeSlave {
   private:
        Session&    session;
        MidiPort*   port;
-        MIDI::Parser    parser;
        PBD::ScopedConnectionList port_connections;
        PBD::ScopedConnection     config_connection;
        bool        can_notify_on_unknown_rate;
@@ -420,7 +409,6 @@ class MIDIClock_Slave : public Slave {
        ~MIDIClock_Slave ();
 
        void rebind (MidiPort&);
-        int process (pframes_t);
        bool speed_and_position (double&, framepos_t&);
 
        bool locked() const;
@@ -436,8 +424,6 @@ class MIDIClock_Slave : public Slave {
 
   protected:
        ISlaveSessionProxy* session;
-       MidiPort* port;
-        MIDI::Parser parser;
        PBD::ScopedConnectionList port_connections;
 
        /// pulses per quarter note for one MIDI clock frame (default 24)
@@ -500,11 +486,11 @@ class MIDIClock_Slave : public Slave {
        bool _starting;
 };
 
-class JACK_Slave : public Slave
+class Engine_Slave : public Slave
 {
   public:
-       JACK_Slave (AudioEngine&);
-       ~JACK_Slave ();
+       Engine_Slave (AudioEngine&);
+       ~Engine_Slave ();
 
        bool speed_and_position (double& speed, framepos_t& pos);