ardour/livetrax
13
0
Fork 0
Code

remove leftover cruft related to wrap buffers from DiskIOProcessor

Browse Source
This commit is contained in:
Paul Davis 2017-10-02 12:36:52 -04:00
parent 2153449400
commit 275756e96a
2 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/ardour/ardour/disk_io.h
View File

@ -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;

18
libs/ardour/disk_io.cc
View File

@ -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