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/session_click.cc | |
| 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/session_click.cc')
| -rw-r--r-- | libs/ardour/session_click.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libs/ardour/session_click.cc b/libs/ardour/session_click.cc index 1d14fd4a80..b50720aa38 100644 --- a/libs/ardour/session_click.cc +++ b/libs/ardour/session_click.cc @@ -25,6 +25,7 @@ #include <ardour/session.h> #include <ardour/tempo.h> #include <ardour/io.h> +#include <ardour/buffer_set.h> #include <sndfile.h> @@ -42,7 +43,6 @@ Session::click (jack_nframes_t start, jack_nframes_t nframes, jack_nframes_t off TempoMap::BBTPointList *points; jack_nframes_t end; Sample *buf; - vector<Sample*> bufs; if (_click_io == 0) { return; @@ -57,7 +57,8 @@ Session::click (jack_nframes_t start, jack_nframes_t nframes, jack_nframes_t off end = start + nframes; - buf = _passthru_buffers[0]; + BufferSet& bufs = get_scratch_buffers(ChanCount(DataType::AUDIO, 1)); + buf = bufs.get_audio(0).data(nframes); points = _tempo_map->get_points (start, end); if (points == 0) { @@ -127,7 +128,7 @@ Session::click (jack_nframes_t start, jack_nframes_t nframes, jack_nframes_t off i = next; } - _click_io->deliver_output (_passthru_buffers, 1, nframes, offset); + _click_io->deliver_output (bufs, nframes, offset); } void |