move need-butler from DiskReader to DiskIOProcessor

diff --git a/libs/ardour/ardour/disk_io.h b/libs/ardour/ardour/disk_io.h
index fba72fcfc8d67c3918c8a9bd3efaa3d812b98f80..d1fa1e7d6628fca9b9f5a231ee1be8f9cddb22b4 100644 (file)
--- 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 4c5244ab99f3a85029f9f160ea9d290a1abf28ea..4f1c47ae8eb6c70ab8fda54fc94be0640a9cf556 100644 (file)
--- 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 d0e6b9dc351c8ca3ead297b87dd9736365c6fd06..48b58ca3f10b02a4ab2467c931c1d7e1e2f55d97 100644 (file)
--- 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 10cf428c822c202b821abfc36ca8ae10b1477c42..1a390afdb34a4efad90f6e5801650e76792e6e35 100644 (file)
--- 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)