From e8b3d38112058ca04619711d6e9b5b065d3a55a6 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 11 Dec 2019 18:00:56 -0700 Subject: variable renaming in Butler for various buffer sizes --- libs/ardour/ardour/butler.h | 12 ++++++------ libs/ardour/butler.cc | 20 ++++++++++---------- libs/ardour/disk_io.cc | 2 +- libs/ardour/disk_reader.cc | 4 ++-- libs/ardour/disk_writer.cc | 4 ++-- 5 files changed, 21 insertions(+), 21 deletions(-) (limited to 'libs/ardour') diff --git a/libs/ardour/ardour/butler.h b/libs/ardour/ardour/butler.h index e4a9c532a8..ba3e483431 100644 --- a/libs/ardour/ardour/butler.h +++ b/libs/ardour/ardour/butler.h @@ -62,9 +62,9 @@ class LIBARDOUR_API Butler : public SessionHandleRef void map_parameters (); - samplecnt_t audio_diskstream_capture_buffer_size() const { return audio_dstream_capture_buffer_size; } - samplecnt_t audio_diskstream_playback_buffer_size() const { return audio_dstream_playback_buffer_size; } - uint32_t midi_diskstream_buffer_size() const { return midi_dstream_buffer_size; } + samplecnt_t audio_capture_buffer_size() const { return _audio_capture_buffer_size; } + samplecnt_t audio_playback_buffer_size() const { return _audio_playback_buffer_size; } + uint32_t midi_buffer_size() const { return _midi_buffer_size; } bool flush_tracks_to_disk_after_locate (boost::shared_ptr, uint32_t& errors); @@ -85,9 +85,9 @@ class LIBARDOUR_API Butler : public SessionHandleRef Glib::Threads::Cond paused; bool should_run; mutable gint should_do_transport_work; - samplecnt_t audio_dstream_capture_buffer_size; - samplecnt_t audio_dstream_playback_buffer_size; - uint32_t midi_dstream_buffer_size; + samplecnt_t _audio_capture_buffer_size; + samplecnt_t _audio_playback_buffer_size; + uint32_t _midi_buffer_size; PBD::RingBuffer pool_trash; private: diff --git a/libs/ardour/butler.cc b/libs/ardour/butler.cc index 98627588f4..974887c649 100644 --- a/libs/ardour/butler.cc +++ b/libs/ardour/butler.cc @@ -50,9 +50,9 @@ Butler::Butler(Session& s) : SessionHandleRef (s) , thread() , have_thread (false) - , audio_dstream_capture_buffer_size(0) - , audio_dstream_playback_buffer_size(0) - , midi_dstream_buffer_size(0) + , _audio_capture_buffer_size(0) + , _audio_playback_buffer_size(0) + , _midi_buffer_size(0) , pool_trash(16) , _xthread (true) { @@ -83,18 +83,18 @@ Butler::config_changed (std::string p) _session.adjust_playback_buffering (); if (Config->get_buffering_preset() == Custom) { /* size is in Samples, not bytes */ - audio_dstream_playback_buffer_size = (uint32_t) floor (Config->get_audio_playback_buffer_seconds() * _session.sample_rate()); + _audio_playback_buffer_size = (uint32_t) floor (Config->get_audio_playback_buffer_seconds() * _session.sample_rate()); _session.adjust_playback_buffering (); } } else if (p == "capture-buffer-seconds") { if (Config->get_buffering_preset() == Custom) { - audio_dstream_capture_buffer_size = (uint32_t) floor (Config->get_audio_capture_buffer_seconds() * _session.sample_rate()); + _audio_capture_buffer_size = (uint32_t) floor (Config->get_audio_capture_buffer_seconds() * _session.sample_rate()); _session.adjust_capture_buffering (); } } else if (p == "buffering-preset") { DiskIOProcessor::set_buffering_parameters (Config->get_buffering_preset()); - audio_dstream_capture_buffer_size = (uint32_t) floor (Config->get_audio_capture_buffer_seconds() * _session.sample_rate()); - audio_dstream_playback_buffer_size = (uint32_t) floor (Config->get_audio_playback_buffer_seconds() * _session.sample_rate()); + _audio_capture_buffer_size = (uint32_t) floor (Config->get_audio_capture_buffer_seconds() * _session.sample_rate()); + _audio_playback_buffer_size = (uint32_t) floor (Config->get_audio_playback_buffer_seconds() * _session.sample_rate()); _session.adjust_capture_buffering (); _session.adjust_playback_buffering (); } else if (p == "midi-readahead") { @@ -110,14 +110,14 @@ Butler::start_thread() /* size is in Samples, not bytes */ const float rate = (float)_session.sample_rate(); - audio_dstream_capture_buffer_size = (uint32_t) floor (Config->get_audio_capture_buffer_seconds() * rate); - audio_dstream_playback_buffer_size = (uint32_t) floor (Config->get_audio_playback_buffer_seconds() * rate); + _audio_capture_buffer_size = (uint32_t) floor (Config->get_audio_capture_buffer_seconds() * rate); + _audio_playback_buffer_size = (uint32_t) floor (Config->get_audio_playback_buffer_seconds() * rate); /* size is in bytes * XXX: AudioEngine needs to tell us the MIDI buffer size * (i.e. how many MIDI bytes we might see in a cycle) */ - midi_dstream_buffer_size = (uint32_t) floor (Config->get_midi_track_buffer_seconds() * rate); + _midi_buffer_size = (uint32_t) floor (Config->get_midi_track_buffer_seconds() * rate); DiskReader::set_midi_readahead_samples ((samplecnt_t) (Config->get_midi_readahead() * rate)); diff --git a/libs/ardour/disk_io.cc b/libs/ardour/disk_io.cc index a55e2c559b..49e0ef1297 100644 --- a/libs/ardour/disk_io.cc +++ b/libs/ardour/disk_io.cc @@ -187,7 +187,7 @@ DiskIOProcessor::configure_io (ChanCount in, ChanCount out) } if (in.n_midi() > 0 && !_midi_buf) { - const size_t size = _session.butler()->midi_diskstream_buffer_size(); + const size_t size = _session.butler()->midi_buffer_size(); _midi_buf = new MidiRingBuffer(size); changed = true; } diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc index 7ef38ce34a..408e0feb5b 100644 --- a/libs/ardour/disk_reader.cc +++ b/libs/ardour/disk_reader.cc @@ -106,7 +106,7 @@ int DiskReader::add_channel_to (boost::shared_ptr c, uint32_t how_many) { while (how_many--) { - c->push_back (new ReaderChannelInfo (_session.butler()->audio_diskstream_playback_buffer_size(), loop_fade_length)); + c->push_back (new ReaderChannelInfo (_session.butler()->audio_playback_buffer_size(), loop_fade_length)); DEBUG_TRACE (DEBUG::DiskIO, string_compose ("%1: new reader channel, write space = %2 read = %3\n", name(), c->back()->rbuf->write_space(), @@ -230,7 +230,7 @@ DiskReader::adjust_buffering () boost::shared_ptr c = channels.reader(); for (ChannelList::iterator chan = c->begin(); chan != c->end(); ++chan) { - (*chan)->resize (_session.butler()->audio_diskstream_playback_buffer_size()); + (*chan)->resize (_session.butler()->audio_playback_buffer_size()); } } diff --git a/libs/ardour/disk_writer.cc b/libs/ardour/disk_writer.cc index 8c4d40ea71..6a455318e9 100644 --- a/libs/ardour/disk_writer.cc +++ b/libs/ardour/disk_writer.cc @@ -97,7 +97,7 @@ int DiskWriter::add_channel_to (boost::shared_ptr c, uint32_t how_many) { while (how_many--) { - c->push_back (new WriterChannelInfo (_session.butler()->audio_diskstream_capture_buffer_size())); + c->push_back (new WriterChannelInfo (_session.butler()->audio_capture_buffer_size())); DEBUG_TRACE (DEBUG::DiskIO, string_compose ("%1: new writer channel, write space = %2 read = %3\n", name(), c->back()->wbuf->write_space(), @@ -1446,7 +1446,7 @@ DiskWriter::adjust_buffering () boost::shared_ptr c = channels.reader(); for (ChannelList::iterator chan = c->begin(); chan != c->end(); ++chan) { - (*chan)->resize (_session.butler()->audio_diskstream_capture_buffer_size()); + (*chan)->resize (_session.butler()->audio_capture_buffer_size()); } } -- cgit v1.2.3