diff options
| author | David Robillard <d@drobilla.net> | 2006-08-12 08:20:24 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-08-12 08:20:24 +0000 |
| commit | 30ab1fd61569f9d7fb7410d483fa68cbf9865c37 (patch) | |
| tree | 60cf9b5228a2728cda6608d517528066253d1a17 /libs/ardour/ardour/redirect.h | |
| parent | cbdf686e391bc2e7b93f37a5d3fa9197cb178078 (diff) | |
Towards MIDI:
- Converted vector<Sample*> to BufferList and numerous counts from int to ChanCount (and related changes)
- Added fancy type-generic iterators to BufferList, PortIterator (see IO::collect_input for a good example of the idea - the same code will work to read all input (of various types in a single IO, eg instruments) without modification no matter how many types we add)
- Fixed comparison operator bugs with ChanCount (screwed up metering among other things)
- Moved peak metering into it's own object, and moved most of the pan related code out of IO to panner (still a touch more to be done here for MIDI playback)
Not directly MIDI related fixes for problems in trunk:
- Fixed varispeed gain/pan automation to work properly (was reading the wrong range of automation data, probably causing nasty clicks?)
- Fixed crash on varispeed looping (possibly only a 64-bit problem). It still doesn't work, but at least it doesn't die
Quite a few things broken, and the new classes are pretty filthy still, but I think the direction is a lot better than all my previous plans...
git-svn-id: svn://localhost/ardour2/branches/midi@795 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/redirect.h')
| -rw-r--r-- | libs/ardour/ardour/redirect.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/ardour/ardour/redirect.h b/libs/ardour/ardour/redirect.h index 4e6ef5124c..62da98aed1 100644 --- 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().get(_default_type); } - virtual uint32_t input_streams () const { return n_inputs().get(_default_type); } - virtual uint32_t natural_output_streams() const { return n_outputs().get(_default_type); } - virtual uint32_t natural_input_streams () const { return n_inputs().get(_default_type); } + 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,7 +81,7 @@ 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, jack_nframes_t nframes, jack_nframes_t offset) = 0; virtual void activate () = 0; virtual void deactivate () = 0; virtual jack_nframes_t latency() { return 0; } |