smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-03 04:09:29 +01:00
Code Issues Projects Releases Wiki Activity

move need-butler from DiskReader to DiskIOProcessor

Browse source
This commit is contained in:
Paul Davis 2017-03-09 12:20:51 +01:00
parent bcd7a21510
commit c6dd3045d1
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libs/ardour/ardour/disk_io.h
View file

@ -92,6 +92,8 @@ class LIBARDOUR_API DiskIOProcessor : public Processor
int add_channel (uint32_t how_many);
int remove_channel (uint32_t how_many);
bool need_butler() const { return _need_butler; }
protected:
friend class Auditioner;
virtual int seek (framepos_t which_sample, bool complete_refill = false) = 0;
@ -112,6 +114,7 @@ class LIBARDOUR_API DiskIOProcessor : public Processor
bool in_set_state;
framecnt_t wrap_buffer_size;
framecnt_t speed_buffer_size;
bool _need_butler;
Glib::Threads::Mutex state_lock;

3
libs/ardour/ardour/disk_reader.h
View file

@ -106,8 +106,6 @@ class LIBARDOUR_API DiskReader : public DiskIOProcessor
int can_internal_playback_seek (framecnt_t distance);
int seek (framepos_t frame, bool complete_refill = false);
bool need_butler() const { return _need_butler; }
PBD::Signal0<void> Underrun;
protected:
@ -137,7 +135,6 @@ class LIBARDOUR_API DiskReader : public DiskIOProcessor
framepos_t file_frame;
framepos_t playback_sample;
MonitorChoice _monitoring_choice;
bool _need_butler;
PBD::ScopedConnectionList playlist_connections;

1
libs/ardour/disk_io.cc
View file

@ -52,6 +52,7 @@ DiskIOProcessor::DiskIOProcessor (Session& s, string const & str, Flag f)
, in_set_state (false)
, wrap_buffer_size (0)
, speed_buffer_size (0)
, _need_butler (false)
, channels (new ChannelList)
{
}

1
libs/ardour/disk_reader.cc
View file

@ -50,7 +50,6 @@ DiskReader::DiskReader (Session& s, string const & str, DiskIOProcessor::Flag f)
, file_frame (0)
, playback_sample (0)
, _monitoring_choice (MonitorDisk)
, _need_butler (false)
, _gui_feed_buffer (AudioEngine::instance()->raw_buffer_size (DataType::MIDI))
, _frames_written_to_ringbuffer (0)
, _frames_read_from_ringbuffer (0)