diff options
| author | David Robillard <d@drobilla.net> | 2007-05-31 21:37:20 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-05-31 21:37:20 +0000 |
| commit | 0f2f4d8efc7f3e1144c6f51fd17c1ab309056c3e (patch) | |
| tree | 5f3b9c752aafcd9874ae55197d678d4b17bbc442 /libs/ardour/audio_playlist.cc | |
| parent | 52a8242a1158426caeed4757bbc3f7f71091e351 (diff) | |
Rewrote MidiRingBuffer to more efficiently pack data (flat pack stamps, sizes, and event data into a single buffer).
Eliminate a double-copy on MIDI playback (MidiRingBuffer -> MidiBuffer).
Various MIDI diskstream/source/SMF fixes (only write when appropriate, handle transport locates, etc).
Fix MIDI rec region size/offset problems.
Code cleanups.
git-svn-id: svn://localhost/ardour2/trunk@1934 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audio_playlist.cc')
| -rw-r--r-- | libs/ardour/audio_playlist.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc index 246384689e..d28d88488e 100644 --- a/libs/ardour/audio_playlist.cc +++ b/libs/ardour/audio_playlist.cc @@ -123,7 +123,6 @@ ARDOUR::nframes_t AudioPlaylist::read (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, nframes_t start, nframes_t cnt, unsigned chan_n) { - nframes_t ret = cnt; nframes_t end; /* optimizing this memset() away involves a lot of conditionals @@ -200,7 +199,7 @@ AudioPlaylist::read (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, nf } } - return ret; + return cnt; } |