Merge branch 'master' into windows

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

diff --git a/libs/ardour/ardour/io_processor.h b/libs/ardour/ardour/io_processor.h
index 7d1854ced085128a96f44a39039ffb443830bfb9..7adfab2225ebe6c0972dc4514b913af41ccc6732 100644 (file)
--- a/libs/ardour/ardour/io_processor.h
+++ b/libs/ardour/ardour/io_processor.h
@@ -23,7 +23,7 @@
 #include <string>
 #include <boost/shared_ptr.hpp>
 
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 
 #include "pbd/undo.h"
 
@@ -44,14 +44,16 @@ class IOProcessor : public Processor
 {
   public:
        IOProcessor (Session&, bool with_input, bool with_output,
-                         const std::string& proc_name, const std::string io_name="",
-                         ARDOUR::DataType default_type = DataType::AUDIO);
-       IOProcessor (Session&, boost::shared_ptr<IO> input, boost::shared_ptr<IO> output,
-                       const std::string& proc_name, ARDOUR::DataType default_type = DataType::AUDIO);
+                    const std::string& proc_name, const std::string io_name="",
+                    ARDOUR::DataType default_type = DataType::AUDIO, bool sendish=false);
+        IOProcessor (Session&, boost::shared_ptr<IO> input, boost::shared_ptr<IO> output,
+                    const std::string& proc_name, ARDOUR::DataType default_type = DataType::AUDIO);
        virtual ~IOProcessor ();
 
        bool set_name (const std::string& str);
 
+       bool does_routing() const { return true; }
+
        virtual ChanCount natural_output_streams() const;
        virtual ChanCount natural_input_streams () const;
 
@@ -62,9 +64,11 @@ class IOProcessor : public Processor
        void set_input (boost::shared_ptr<IO>);
        void set_output (boost::shared_ptr<IO>);
 
-       void silence (nframes_t nframes);
+       void silence (framecnt_t nframes);
        void disconnect ();
 
+       void increment_port_buffer_offset (pframes_t);
+
        virtual bool feeds (boost::shared_ptr<Route> other) const;
 
        PBD::Signal2<void,IOProcessor*,bool>     AutomationPlaybackChanged;
@@ -72,7 +76,9 @@ class IOProcessor : public Processor
 
        XMLNode& state (bool full_state);
        int set_state (const XMLNode&, int version);
-       
+
+       static void prepare_for_reset (XMLNode& state, const std::string& name);
+
   protected:
        boost::shared_ptr<IO> _input;
        boost::shared_ptr<IO> _output;
@@ -82,7 +88,7 @@ class IOProcessor : public Processor
        IOProcessor (const IOProcessor&);
 
        virtual int set_state_2X (const XMLNode &, int);
-       
+
        bool _own_input;
        bool _own_output;