new tempo handling from drmoore; don't follow playhead when doing requested_return...

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

diff --git a/libs/ardour/ardour/insert.h b/libs/ardour/ardour/insert.h
index c81d4e576190533133487167963f31cf79defd1b..9d063ca54b4aad6a0c2e14aa147be79ed569a28a 100644 (file)
--- a/libs/ardour/ardour/insert.h
+++ b/libs/ardour/ardour/insert.h
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_insert_h__
@@ -28,7 +27,6 @@
 #include <sigc++/signal.h>
 #include <ardour/ardour.h>
 #include <ardour/redirect.h>
-#include <ardour/plugin_state.h>
 #include <ardour/types.h>
 
 class XMLNode;
@@ -46,14 +44,12 @@ class Plugin;
 class Insert : public Redirect
 {
   public:
-       Insert(Session& s, Placement p);
-       Insert(Session& s, string name, Placement p);
-
-       Insert(Session& s, Placement p, int imin, int imax, int omin, int omax);
+       Insert(Session& s, std::string name, Placement p);
+       Insert(Session& s, std::string name, Placement p, int imin, int imax, int omin, int omax);
        
        virtual ~Insert() { }
 
-       virtual void run (vector<Sample *>& bufs, uint32_t nbufs, jack_nframes_t nframes, jack_nframes_t offset) = 0;
+       virtual void run (vector<Sample *>& bufs, uint32_t nbufs, nframes_t nframes, nframes_t offset) = 0;
        virtual void activate () {}
        virtual void deactivate () {}
 
@@ -75,9 +71,9 @@ class PortInsert : public Insert
        int set_state(const XMLNode&);
 
        void init ();
-       void run (vector<Sample *>& bufs, uint32_t nbufs, jack_nframes_t nframes, jack_nframes_t offset);
+       void run (vector<Sample *>& bufs, uint32_t nbufs, nframes_t nframes, nframes_t offset);
 
-       jack_nframes_t latency();
+       nframes_t latency();
        
        uint32_t output_streams() const;
        uint32_t input_streams() const;
@@ -85,15 +81,11 @@ class PortInsert : public Insert
        int32_t can_support_input_configuration (int32_t) const;
        int32_t configure_io (int32_t magic, int32_t in, int32_t out);
        int32_t compute_output_streams (int32_t cnt) const;
-};
 
-struct PluginInsertState : public RedirectState
-{
-    PluginInsertState (std::string why) 
-           : RedirectState (why) {}
-    ~PluginInsertState() {}
+       uint32_t bit_slot() const { return bitslot; }
 
-    PluginState plugin_state;
+  private:
+       uint32_t bitslot;
 };
 
 class PluginInsert : public Insert
@@ -110,15 +102,12 @@ class PluginInsert : public Insert
        XMLNode& get_state(void);
        int set_state(const XMLNode&);
 
-       StateManager::State* state_factory (std::string why) const;
-       Change restore_state (StateManager::State&);
-
-       void run (vector<Sample *>& bufs, uint32_t nbufs, jack_nframes_t nframes, jack_nframes_t offset);
-       void silence (jack_nframes_t nframes, jack_nframes_t offset);
+       void run (vector<Sample *>& bufs, uint32_t nbufs, nframes_t nframes, nframes_t offset);
+       void silence (nframes_t nframes, nframes_t offset);
        void activate ();
        void deactivate ();
 
-       void set_block_size (jack_nframes_t nframes);
+       void set_block_size (nframes_t nframes);
 
        uint32_t output_streams() const;
        uint32_t input_streams() const;
@@ -154,21 +143,18 @@ class PluginInsert : public Insert
 
        string describe_parameter (uint32_t);
 
-       jack_nframes_t latency();
-
-       void transport_stopped (jack_nframes_t now);
-       void automation_snapshot (jack_nframes_t now);
+       nframes_t latency();
 
-  protected:
-       void store_state (PluginInsertState&) const;
+       void transport_stopped (nframes_t now);
+       void automation_snapshot (nframes_t now);
 
   private:
 
        void parameter_changed (uint32_t, float);
        
        vector<boost::shared_ptr<Plugin> > _plugins;
-       void automation_run (vector<Sample *>& bufs, uint32_t nbufs, jack_nframes_t nframes, jack_nframes_t offset);
-       void connect_and_run (vector<Sample *>& bufs, uint32_t nbufs, jack_nframes_t nframes, jack_nframes_t offset, bool with_auto, jack_nframes_t now = 0);
+       void automation_run (vector<Sample *>& bufs, uint32_t nbufs, nframes_t nframes, nframes_t offset);
+       void connect_and_run (vector<Sample *>& bufs, uint32_t nbufs, nframes_t nframes, nframes_t offset, bool with_auto, nframes_t now = 0);
 
        void init ();
        void set_automatable ();