diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2017-03-08 19:46:24 +0100 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-18 11:40:52 -0400 |
commit | bcd7a21510a0ddd6d33ea96b6d70a8a20c784fc1 (patch) | |
tree | b72ea439fb8a4ac98cc200d7a294e0a374ed2a7e /libs/ardour/disk_reader.cc | |
parent | 7fb6807ed32cbcf63cb4b3d9545310c668bbaaaa (diff) |
move ChannelInfo structure from DiskReader into DiskIOProcessor
Diffstat (limited to 'libs/ardour/disk_reader.cc')
-rw-r--r-- | libs/ardour/disk_reader.cc | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc index 0769d1c75a..10cf428c82 100644 --- a/libs/ardour/disk_reader.cc +++ b/libs/ardour/disk_reader.cc @@ -54,7 +54,6 @@ DiskReader::DiskReader (Session& s, string const & str, DiskIOProcessor::Flag f) , _gui_feed_buffer (AudioEngine::instance()->raw_buffer_size (DataType::MIDI)) , _frames_written_to_ringbuffer (0) , _frames_read_from_ringbuffer (0) - , channels (new ChannelList) { } @@ -232,55 +231,6 @@ DiskReader::set_loop (Location *location) return 0; } -int -DiskReader::add_channel_to (boost::shared_ptr<ChannelList> c, uint32_t how_many) -{ - while (how_many--) { - c->push_back (new ChannelInfo( - _session.butler()->audio_diskstream_playback_buffer_size(), - speed_buffer_size, wrap_buffer_size)); - interpolation.add_channel_to ( - _session.butler()->audio_diskstream_playback_buffer_size(), - speed_buffer_size); - } - - _n_channels.set (DataType::AUDIO, c->size()); - - return 0; -} - -int -DiskReader::add_channel (uint32_t how_many) -{ - RCUWriter<ChannelList> writer (channels); - boost::shared_ptr<ChannelList> c = writer.get_copy(); - - return add_channel_to (c, how_many); -} - -int -DiskReader::remove_channel_from (boost::shared_ptr<ChannelList> c, uint32_t how_many) -{ - while (how_many-- && !c->empty()) { - delete c->back(); - c->pop_back(); - interpolation.remove_channel_from (); - } - - _n_channels.set(DataType::AUDIO, c->size()); - - return 0; -} - -int -DiskReader::remove_channel (uint32_t how_many) -{ - RCUWriter<ChannelList> writer (channels); - boost::shared_ptr<ChannelList> c = writer.get_copy(); - - return remove_channel_from (c, how_many); -} - float DiskReader::buffer_load () const { |