diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2019-10-17 17:32:56 -0600 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2019-11-02 16:32:18 -0600 |
commit | 0573e7cdf088f194b082e5546796161fe37109a8 (patch) | |
tree | cefa474b50c3c5111edad0bef131b4f256963403 /libs/ardour/ardour | |
parent | 2cf9ad8f8c21cc445c8eabc6856fd9956926203f (diff) |
alter where note resolution happens when a re-rendering is scheduled for a MIDI track
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r-- | libs/ardour/ardour/disk_reader.h | 1 | ||||
-rw-r--r-- | libs/ardour/ardour/midi_playlist.h | 9 | ||||
-rw-r--r-- | libs/ardour/ardour/midi_track.h | 1 |
3 files changed, 2 insertions, 9 deletions
diff --git a/libs/ardour/ardour/disk_reader.h b/libs/ardour/ardour/disk_reader.h index 384bbbc2ce..3c22b80e87 100644 --- a/libs/ardour/ardour/disk_reader.h +++ b/libs/ardour/ardour/disk_reader.h @@ -157,6 +157,7 @@ private: samplepos_t overwrite_sample; mutable gint _pending_overwrite; bool overwrite_queued; + bool run_must_resolve; IOChange input_change_pending; samplepos_t file_sample[DataType::num_types]; diff --git a/libs/ardour/ardour/midi_playlist.h b/libs/ardour/ardour/midi_playlist.h index 1b01bbdc2d..82f7cb690f 100644 --- a/libs/ardour/ardour/midi_playlist.h +++ b/libs/ardour/ardour/midi_playlist.h @@ -100,15 +100,6 @@ public: std::set<Evoral::Parameter> contained_automation(); - /** Handle a region edit during read. - * - * This must be called before the command is applied to the model. Events - * are injected into the playlist output to compensate for edits to active - * notes and maintain coherent output and tracker state. - */ - void region_edited(boost::shared_ptr<Region> region, - const MidiModel::NoteDiffCommand* cmd); - /** Clear all note trackers. */ void reset_note_trackers (); diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h index e32b1c5b32..ebe4e9bd56 100644 --- a/libs/ardour/ardour/midi_track.h +++ b/libs/ardour/ardour/midi_track.h @@ -137,6 +137,7 @@ public: PBD::Signal0<void> InputActiveChanged; void realtime_handle_transport_stopped (); + void region_edited (boost::shared_ptr<Region>); protected: |