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 55e0cfb2d6f24a1683687aea71393dd403c394c9..182208e5608cf455bcfbfe145fef1e5727feef76 100644 (file)
--- a/libs/ardour/ardour/processor.h
+++ b/libs/ardour/ardour/processor.h
@@ -61,16 +61,16 @@ class Processor : public SessionObject, public Automatable, public Latent
        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 framecnt_t signal_latency() const { return 0; }
 
-       virtual int set_block_size (nframes_t /*nframes*/) { return 0; }
+       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*/, framepos_t /*start_frame*/, framepos_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(); }
@@ -99,6 +99,8 @@ class Processor : public SessionObject, public Automatable, public Latent
        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;
@@ -107,9 +109,6 @@ protected:
        ChanCount _configured_output;
        bool      _display_to_user;
        bool      _pre_fader;
-
-private:
-       int set_state_2X (const XMLNode&, int version);
 };
 
 } // namespace ARDOUR