Remove all use of nframes_t.

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

diff --git a/libs/ardour/ardour/processor.h b/libs/ardour/ardour/processor.h
index ea468f92be0d217412c6d2c3ad6c938c4bd9dd71..182208e5608cf455bcfbfe145fef1e5727feef76 100644 (file)
--- a/libs/ardour/ardour/processor.h
+++ b/libs/ardour/ardour/processor.h
@@ -26,13 +26,12 @@
 
 #include "pbd/statefuldestructible.h"
 
-
 #include "ardour/ardour.h"
-#include "ardour/automatable_controls.h"
 #include "ardour/buffer_set.h"
 #include "ardour/latent.h"
 #include "ardour/session_object.h"
 #include "ardour/types.h"
+#include "ardour/automatable.h"
 
 class XMLNode;
 
@@ -43,7 +42,7 @@ class Route;
 
 /* A mixer strip element - plugin, send, meter, etc.
  */
-class Processor : public SessionObject, public AutomatableControls, public Latent
+class Processor : public SessionObject, public Automatable, public Latent
 {
   public:
        static const std::string state_node_name;
@@ -62,20 +61,20 @@ class Processor : public SessionObject, public AutomatableControls, public Laten
        bool get_next_ab_is_active () const { return _next_ab_is_active; }
        void set_next_ab_is_active (bool yn) { _next_ab_is_active = yn; }
 
-       virtual nframes_t signal_latency() const { return 0; }
-
-       virtual void transport_stopped (sframes_t /*frame*/) {}
+       virtual framecnt_t signal_latency() const { return 0; }
 
-       virtual void set_block_size (nframes_t /*nframes*/) {}
+       virtual int set_block_size (pframes_t /*nframes*/) { return 0; }
+        virtual bool requires_fixed_sized_buffers() const { return false; }
 
        /** @param result_required true if, on return from this method, bufs is required to contain valid data;
         *  if false, the method need not bother writing to bufs if it doesn't want to.
         */  
-       virtual void run (BufferSet& /*bufs*/, sframes_t /*start_frame*/, sframes_t /*end_frame*/, nframes_t /*nframes*/, bool result_required) {}
-       virtual void silence (nframes_t /*nframes*/) {}
+       virtual void run (BufferSet& /*bufs*/, framepos_t /*start_frame*/, framepos_t /*end_frame*/, pframes_t /*nframes*/, bool /*result_required*/) {}
+       virtual void silence (framecnt_t /*nframes*/) {}
 
        virtual void activate ()   { _pending_active = true; ActiveChanged(); }
        virtual void deactivate () { _pending_active = false; ActiveChanged(); }
+        virtual void flush() {}
 
        virtual bool configure_io (ChanCount in, ChanCount out);
 
@@ -94,27 +93,22 @@ class Processor : public SessionObject, public AutomatableControls, public Laten
        XMLNode& get_state (void);
        int set_state (const XMLNode&, int version);
        
-       void *get_gui () const { return _gui; }
-       void  set_gui (void *p) { _gui = p; }
-
        void set_pre_fader (bool);
 
        PBD::Signal0<void>                     ActiveChanged;
        PBD::Signal2<void,ChanCount,ChanCount> ConfigurationChanged;
 
 protected:
+       virtual int set_state_2X (const XMLNode&, int version);
+       
        int       _pending_active;
        bool      _active;
        bool      _next_ab_is_active;
        bool      _configured;
        ChanCount _configured_input;
        ChanCount _configured_output;
-       void*     _gui;  /* generic, we don't know or care what this is */
        bool      _display_to_user;
        bool      _pre_fader;
-
-private:
-       int set_state_2X (const XMLNode&, int version);
 };
 
 } // namespace ARDOUR