diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2017-07-25 12:46:05 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-18 11:40:53 -0400 |
commit | ece52d3278935a8943936696ef09003f81998ef2 (patch) | |
tree | 5e8d016d50efa610420f6b7f8fdeb4a27d754911 /libs/ardour/ardour | |
parent | 4dc5be093611e0b72b7ac1c4972f87aa40bffb1e (diff) |
move _file_frame from DiskIOProcessor into DiskReader (only place where it is needed); split into by-type array to deal with different rate of audio & MIDI i/o
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r-- | libs/ardour/ardour/disk_io.h | 1 | ||||
-rw-r--r-- | libs/ardour/ardour/disk_reader.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/libs/ardour/ardour/disk_io.h b/libs/ardour/ardour/disk_io.h index 2224978c36..7f9232b426 100644 --- a/libs/ardour/ardour/disk_io.h +++ b/libs/ardour/ardour/disk_io.h @@ -129,7 +129,6 @@ class LIBARDOUR_API DiskIOProcessor : public Processor bool _slaved; Location* loop_location; bool in_set_state; - framepos_t file_frame; framepos_t playback_sample; framecnt_t wrap_buffer_size; framecnt_t speed_buffer_size; diff --git a/libs/ardour/ardour/disk_reader.h b/libs/ardour/ardour/disk_reader.h index c07dbab585..cc98a1174b 100644 --- a/libs/ardour/ardour/disk_reader.h +++ b/libs/ardour/ardour/disk_reader.h @@ -122,7 +122,7 @@ class LIBARDOUR_API DiskReader : public DiskIOProcessor bool _pending_overwrite; bool overwrite_queued; IOChange input_change_pending; - framecnt_t wrap_buffer_size; + framepos_t file_frame[DataType::num_types]; int _do_refill_with_alloc (bool partial_fill); |