diff options
| -rw-r--r-- | libs/ardour/ardour/audio_diskstream.h | 1 | ||||
| -rw-r--r-- | libs/ardour/ardour/diskstream.h | 1 | ||||
| -rw-r--r-- | libs/ardour/audio_diskstream.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/diskstream.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/midi_diskstream.cc | 19 |
5 files changed, 4 insertions, 21 deletions
diff --git a/libs/ardour/ardour/audio_diskstream.h b/libs/ardour/ardour/audio_diskstream.h index 2bd44d62a6..ff0a1c2a69 100644 --- a/libs/ardour/ardour/audio_diskstream.h +++ b/libs/ardour/ardour/audio_diskstream.h @@ -284,6 +284,7 @@ class AudioDiskstream : public Diskstream int add_channel_to (boost::shared_ptr<ChannelList>, uint32_t how_many); int remove_channel_from (boost::shared_ptr<ChannelList>, uint32_t how_many); + framecnt_t playback_distance; }; } // namespace ARDOUR diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h index cd5932b3e5..e81d8a1fd1 100644 --- a/libs/ardour/ardour/diskstream.h +++ b/libs/ardour/ardour/diskstream.h @@ -288,7 +288,6 @@ class Diskstream : public SessionObject, public PublicDiskstream framepos_t file_frame; framepos_t playback_sample; - framecnt_t playback_distance; uint32_t _read_data_count; uint32_t _write_data_count; diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc index 8a161c3977..a4c6ec178c 100644 --- a/libs/ardour/audio_diskstream.cc +++ b/libs/ardour/audio_diskstream.cc @@ -76,6 +76,7 @@ AudioDiskstream::AudioDiskstream (Session &sess, const string &name, Diskstream: : Diskstream(sess, name, flag) , deprecated_io_node(NULL) , channels (new ChannelList) + , playback_distance (0) { /* prevent any write sources from being created */ @@ -88,6 +89,7 @@ AudioDiskstream::AudioDiskstream (Session& sess, const XMLNode& node) : Diskstream(sess, node) , deprecated_io_node(NULL) , channels (new ChannelList) + , playback_distance (0) { in_set_state = true; init (); diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc index df9d1a9b4d..8720ea6d86 100644 --- a/libs/ardour/diskstream.cc +++ b/libs/ardour/diskstream.cc @@ -106,7 +106,6 @@ Diskstream::Diskstream (Session &sess, const string &name, Flag flag) , _target_speed (_speed) , file_frame (0) , playback_sample (0) - , playback_distance (0) , _read_data_count (0) , _write_data_count (0) , in_set_state (false) @@ -150,7 +149,6 @@ Diskstream::Diskstream (Session& sess, const XMLNode& /*node*/) , _target_speed (_speed) , file_frame (0) , playback_sample (0) - , playback_distance (0) , _read_data_count (0) , _write_data_count (0) , in_set_state (false) diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc index 96a34c661c..50ad39c576 100644 --- a/libs/ardour/midi_diskstream.cc +++ b/libs/ardour/midi_diskstream.cc @@ -496,8 +496,6 @@ MidiDiskstream::process (framepos_t transport_frame, pframes_t nframes, bool can bool nominally_recording; bool re = record_enabled (); - playback_distance = 0; - check_record_status (transport_frame, can_record); nominally_recording = (can_record && re); @@ -559,25 +557,10 @@ MidiDiskstream::process (framepos_t transport_frame, pframes_t nframes, bool can } if (rec_nframes) { - /* data will be written to disk */ - - if (rec_nframes == nframes && rec_offset == 0) { - playback_distance = nframes; - } - adjust_capture_position = rec_nframes; - - } else if (nominally_recording) { - - /* XXXX do this for MIDI !!! - can't do actual capture yet - waiting for latency effects to finish before we start - */ - - playback_distance = nframes; - } - + ret = 0; if (commit (nframes)) { |