Towards MIDI:

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

diff --git a/libs/ardour/ardour/insert.h b/libs/ardour/ardour/insert.h
index c81d4e576190533133487167963f31cf79defd1b..b958f20b95c3b3d9b114de5594292e6048211763 100644 (file)
--- a/libs/ardour/ardour/insert.h
+++ b/libs/ardour/ardour/insert.h
@@ -53,7 +53,7 @@ class Insert : public Redirect
        
        virtual ~Insert() { }
 
-       virtual void run (vector<Sample *>& bufs, uint32_t nbufs, jack_nframes_t nframes, jack_nframes_t offset) = 0;
+       virtual void run (BufferSet& bufs, jack_nframes_t nframes, jack_nframes_t offset) = 0;
        virtual void activate () {}
        virtual void deactivate () {}
 
@@ -75,12 +75,12 @@ 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 (BufferSet& bufs, jack_nframes_t nframes, jack_nframes_t offset);
 
        jack_nframes_t latency();
        
-       uint32_t output_streams() const;
-       uint32_t input_streams() const;
+       ChanCount output_streams() const;
+       ChanCount input_streams() const;
 
        int32_t can_support_input_configuration (int32_t) const;
        int32_t configure_io (int32_t magic, int32_t in, int32_t out);
@@ -113,17 +113,17 @@ class PluginInsert : public Insert
        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 run (BufferSet& bufs, jack_nframes_t nframes, jack_nframes_t offset);
        void silence (jack_nframes_t nframes, jack_nframes_t offset);
        void activate ();
        void deactivate ();
 
        void set_block_size (jack_nframes_t nframes);
 
-       uint32_t output_streams() const;
-       uint32_t input_streams() const;
-       uint32_t natural_output_streams() const;
-       uint32_t natural_input_streams() const;
+       ChanCount output_streams() const;
+       ChanCount input_streams() const;
+       ChanCount natural_output_streams() const;
+       ChanCount natural_input_streams() const;
 
        int      set_count (uint32_t num);
        uint32_t get_count () const { return _plugins.size(); }
@@ -167,8 +167,8 @@ class PluginInsert : public Insert
        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 (BufferSet& bufs, jack_nframes_t nframes, jack_nframes_t offset);
+       void connect_and_run (BufferSet& bufs, jack_nframes_t nframes, jack_nframes_t offset, bool with_auto, jack_nframes_t now = 0);
 
        void init ();
        void set_automatable ();