diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2017-04-10 10:25:00 +0100 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-18 11:40:53 -0400 |
| commit | 361cab503b6f51be4612037610924d302b1f6a22 (patch) | |
| tree | 2bbaf331fc96ed0f01d78aa6ed1307f1e23f9a33 /libs/ardour/butler.cc | |
| parent | 35c7274cc96a04f166df78249e66ae4a32a53a66 (diff) | |
random changes required to get an audio track created and transport functional
Diffstat (limited to 'libs/ardour/butler.cc')
| -rw-r--r-- | libs/ardour/butler.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/libs/ardour/butler.cc b/libs/ardour/butler.cc index 5e743cd569..475735a2e1 100644 --- a/libs/ardour/butler.cc +++ b/libs/ardour/butler.cc @@ -27,10 +27,12 @@ #include "pbd/error.h" #include "pbd/pthread_utils.h" -#include "ardour/debug.h" + #include "ardour/butler.h" +#include "ardour/debug.h" +#include "ardour/disk_io.h" +#include "ardour/disk_reader.h" #include "ardour/io.h" -#include "ardour/midi_diskstream.h" #include "ardour/session.h" #include "ardour/track.h" #include "ardour/auditioner.h" @@ -95,13 +97,13 @@ Butler::config_changed (std::string p) #endif } } else if (p == "buffering-preset") { - Diskstream::set_buffering_parameters (Config->get_buffering_preset()); + DiskIOProcessor::set_buffering_parameters (Config->get_buffering_preset()); audio_dstream_capture_buffer_size = (uint32_t) floor (Config->get_audio_capture_buffer_seconds() * _session.frame_rate()); audio_dstream_playback_buffer_size = (uint32_t) floor (Config->get_audio_playback_buffer_seconds() * _session.frame_rate()); _session.adjust_capture_buffering (); _session.adjust_playback_buffering (); } else if (p == "midi-readahead") { - MidiDiskstream::set_readahead_frames ((framecnt_t) (Config->get_midi_readahead() * _session.frame_rate())); + DiskReader::set_midi_readahead_frames ((framecnt_t) (Config->get_midi_readahead() * _session.frame_rate())); } } @@ -109,7 +111,7 @@ int Butler::start_thread() { // set up capture and playback buffering - Diskstream::set_buffering_parameters (Config->get_buffering_preset()); + DiskIOProcessor::set_buffering_parameters (Config->get_buffering_preset()); /* size is in Samples, not bytes */ const float rate = (float)_session.frame_rate(); @@ -122,7 +124,7 @@ Butler::start_thread() */ midi_dstream_buffer_size = (uint32_t) floor (Config->get_midi_track_buffer_seconds() * rate); - MidiDiskstream::set_readahead_frames ((framecnt_t) (Config->get_midi_readahead() * rate)); + DiskReader::set_midi_readahead_frames ((framecnt_t) (Config->get_midi_readahead() * rate)); should_run = false; |