diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-03-26 19:01:12 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-03-26 19:01:12 +0000 |
| commit | ea9979b4b9b2b0b5d3b50b58b518b0562198fefb (patch) | |
| tree | 74608202cc90b520b492405470abff5d99cac9e7 /libs/ardour/ardour/audio_diskstream.h | |
| parent | e25bff1a346993d39baf2d523b1e247227866362 (diff) | |
remove Evoral::RingBuffer, which was (a) duplicating PBD::RingBufferNPT and (b) broken; replace it with PBD::RingBufferNPT
git-svn-id: svn://localhost/ardour2/branches/3.0@9212 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/audio_diskstream.h')
| -rw-r--r-- | libs/ardour/ardour/audio_diskstream.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/ardour/ardour/audio_diskstream.h b/libs/ardour/ardour/audio_diskstream.h index 12ad418a75..bbf218b4de 100644 --- a/libs/ardour/ardour/audio_diskstream.h +++ b/libs/ardour/ardour/audio_diskstream.h @@ -205,17 +205,17 @@ class AudioDiskstream : public Diskstream Sample *current_capture_buffer; Sample *current_playback_buffer; - RingBufferNPT<Sample> *playback_buf; - RingBufferNPT<Sample> *capture_buf; + PBD::RingBufferNPT<Sample> *playback_buf; + PBD::RingBufferNPT<Sample> *capture_buf; Sample* scrub_buffer; Sample* scrub_forward_buffer; Sample* scrub_reverse_buffer; - RingBufferNPT<Sample>::rw_vector playback_vector; - RingBufferNPT<Sample>::rw_vector capture_vector; + PBD::RingBufferNPT<Sample>::rw_vector playback_vector; + PBD::RingBufferNPT<Sample>::rw_vector capture_vector; - RingBufferNPT<CaptureTransition> * capture_transition_buf; + PBD::RingBufferNPT<CaptureTransition> * capture_transition_buf; // the following are used in the butler thread only framecnt_t curr_capture_cnt; |