remove leftover cruft related to wrap buffers from DiskIOProcessor

diff --git a/libs/ardour/ardour/disk_io.h b/libs/ardour/ardour/disk_io.h
index bb93e51298d4beb0bbaa7b6f00cd6e3279d55265..9f50a0ac6a05d8fdd94b712f71a178d36fde0d2c 100644 (file)
--- a/libs/ardour/ardour/disk_io.h
+++ b/libs/ardour/ardour/disk_io.h
@@ -120,15 +120,11 @@ class LIBARDOUR_API DiskIOProcessor : public Processor
        uint32_t      i_am_the_modifier;
        double       _actual_speed;
        double       _target_speed;
-       /* items needed for speed change logic */
-       bool         _buffer_reallocation_required;
        bool         _seek_required;
        bool         _slaved;
        Location*     loop_location;
        bool          in_set_state;
-       samplepos_t     playback_sample;
-       samplecnt_t    wrap_buffer_size;
-       samplecnt_t    speed_buffer_size;
+       samplepos_t   playback_sample;
        bool         _need_butler;
        boost::shared_ptr<Route> _route;
 

diff --git a/libs/ardour/disk_io.cc b/libs/ardour/disk_io.cc
index 47f3117d0566ddc407e4f8e0ab3b6a2e920e2b92..147a5b83baec26b7e12d8102043d9f8d6d973363 100644 (file)
--- a/libs/ardour/disk_io.cc
+++ b/libs/ardour/disk_io.cc
@@ -50,14 +50,11 @@ DiskIOProcessor::DiskIOProcessor (Session& s, string const & str, Flag f)
        : Processor (s, str)
        , _flags (f)
        , i_am_the_modifier (false)
-       , _buffer_reallocation_required (false)
        , _seek_required (false)
        , _slaved (false)
        , loop_location (0)
        , in_set_state (false)
        , playback_sample (0)
-       , wrap_buffer_size (0)
-       , speed_buffer_size (0)
        , _need_butler (false)
        , channels (new ChannelList)
        , _midi_buf (new MidiRingBuffer<samplepos_t> (s.butler()->midi_diskstream_buffer_size()))
@@ -214,10 +211,6 @@ DiskIOProcessor::non_realtime_locate (samplepos_t location)
 void
 DiskIOProcessor::non_realtime_speed_change ()
 {
-       if (_buffer_reallocation_required) {
-               _buffer_reallocation_required = false;
-       }
-
        if (_seek_required) {
                seek (_session.transport_sample(), true);
                _seek_required = false;
@@ -227,16 +220,7 @@ DiskIOProcessor::non_realtime_speed_change ()
 bool
 DiskIOProcessor::realtime_speed_change ()
 {
-       const samplecnt_t required_wrap_size = (samplecnt_t) ceil (_session.get_block_size() * fabs (_session.transport_speed())) + 2;
-       bool _buffer_reallocation_required;
-
-       if (required_wrap_size > wrap_buffer_size) {
-               _buffer_reallocation_required = true;
-       } else {
-               _buffer_reallocation_required = false;
-       }
-
-       return _buffer_reallocation_required;
+       return true;
 }
 
 int