From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 9 Mar 2017 11:20:51 +0000 (+0100)
Subject: move need-butler from DiskReader to DiskIOProcessor
X-Git-Tag: 6.0-pre0~142
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=c6dd3045d1079f1b3c53451749dc01137428bcfc;p=ardour.git

move need-butler from DiskReader to DiskIOProcessor
---

diff --git a/libs/ardour/ardour/disk_io.h b/libs/ardour/ardour/disk_io.h
index fba72fcfc8..d1fa1e7d66 100644
--- a/libs/ardour/ardour/disk_io.h
+++ b/libs/ardour/ardour/disk_io.h
@@ -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;
 
diff --git a/libs/ardour/ardour/disk_reader.h b/libs/ardour/ardour/disk_reader.h
index 4c5244ab99..4f1c47ae8e 100644
--- a/libs/ardour/ardour/disk_reader.h
+++ b/libs/ardour/ardour/disk_reader.h
@@ -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;
 
diff --git a/libs/ardour/disk_io.cc b/libs/ardour/disk_io.cc
index d0e6b9dc35..48b58ca3f1 100644
--- a/libs/ardour/disk_io.cc
+++ b/libs/ardour/disk_io.cc
@@ -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)
 {
 }
diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc
index 10cf428c82..1a390afdb3 100644
--- a/libs/ardour/disk_reader.cc
+++ b/libs/ardour/disk_reader.cc
@@ -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)