Merged with trunk R992.

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

diff --git a/libs/ardour/ardour/redirect.h b/libs/ardour/ardour/redirect.h
index 658cab5d3b509e633bbb29f24b11988771829e67..ae58fa9b7095b303e92bb88ee73e57619fc5fd90 100644 (file)
--- a/libs/ardour/ardour/redirect.h
+++ b/libs/ardour/ardour/redirect.h
@@ -70,10 +70,10 @@ class Redirect : public IO
        bool active () const { return _active; }
        void set_active (bool yn, void *src);
 
-       virtual uint32_t output_streams() const { return n_outputs(); }
-       virtual uint32_t input_streams () const { return n_inputs(); }
-       virtual uint32_t natural_output_streams() const { return n_outputs(); }
-       virtual uint32_t natural_input_streams () const { return n_inputs(); }
+       virtual ChanCount output_streams() const { return n_outputs(); }
+       virtual ChanCount input_streams () const { return n_inputs(); }
+       virtual ChanCount natural_output_streams() const { return n_outputs(); }
+       virtual ChanCount natural_input_streams () const { return n_inputs(); }
 
        uint32_t sort_key() const { return _sort_key; }
        void set_sort_key (uint32_t key);
@@ -81,18 +81,17 @@ class Redirect : public IO
        Placement placement() const { return _placement; }
        void set_placement (Placement, void *src);
 
-       virtual void run (vector<Sample *>& ibufs, uint32_t nbufs, jack_nframes_t nframes, jack_nframes_t offset) = 0;
+       virtual void run (BufferSet& bufs, nframes_t start_frame, nframes_t end_frame, nframes_t nframes, nframes_t offset) = 0;
        virtual void activate () = 0;
        virtual void deactivate () = 0;
-       virtual jack_nframes_t latency() { return 0; }
+       virtual nframes_t latency() { return 0; }
 
-       virtual void set_block_size (jack_nframes_t nframes) {}
+       virtual void set_block_size (nframes_t nframes) {}
 
        sigc::signal<void,Redirect*,void*> active_changed;
        sigc::signal<void,Redirect*,void*> placement_changed;
        sigc::signal<void,Redirect*,bool>  AutomationPlaybackChanged;
        sigc::signal<void,Redirect*,uint32_t> AutomationChanged;
-       sigc::signal<void,Redirect*> GoingAway;
 
        static sigc::signal<void,Redirect*> RedirectCreated;
        
@@ -121,9 +120,9 @@ class Redirect : public IO
        void mark_automation_visible (uint32_t, bool);
        
        AutomationList& automation_list (uint32_t);
-       bool find_next_event (jack_nframes_t, jack_nframes_t, ControlEvent&) const;
+       bool find_next_event (nframes_t, nframes_t, ControlEvent&) const;
 
-       virtual void transport_stopped (jack_nframes_t frame) {};
+       virtual void transport_stopped (nframes_t frame) {};
        
   protected:
        void set_placement (const string&, void *src);