From e8b5b4fcf3e9b755c953a6e25a343640d64fe3d9 Mon Sep 17 00:00:00 2001 From: nick_m Date: Sat, 4 Mar 2017 11:28:49 +1100 Subject: offset linked regions to compensate for negative start after trim drag. - should fix 7105 --- libs/ardour/ardour/midi_model.h | 1 + libs/ardour/ardour/midi_region.h | 3 +++ 2 files changed, 4 insertions(+) (limited to 'libs/ardour/ardour') diff --git a/libs/ardour/ardour/midi_model.h b/libs/ardour/ardour/midi_model.h index cdf7b3fd3b..fb71f69085 100644 --- a/libs/ardour/ardour/midi_model.h +++ b/libs/ardour/ardour/midi_model.h @@ -275,6 +275,7 @@ public: int set_state(const XMLNode&) { return 0; } PBD::Signal0 ContentsChanged; + PBD::Signal1 ContentsShifted; boost::shared_ptr midi_source (); void set_midi_source (boost::shared_ptr); diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h index b41f620e87..e6357746f7 100644 --- a/libs/ardour/ardour/midi_region.h +++ b/libs/ardour/ardour/midi_region.h @@ -153,6 +153,7 @@ class LIBARDOUR_API MidiRegion : public Region void update_length_beats (const int32_t sub_num); void model_changed (); + void model_shifted (double qn_distance); void model_automation_state_changed (Evoral::Parameter const &); void set_start_beats_from_start_frames (); @@ -160,8 +161,10 @@ class LIBARDOUR_API MidiRegion : public Region std::set _filtered_parameters; ///< parameters that we ask our source not to return when reading PBD::ScopedConnection _model_connection; + PBD::ScopedConnection _model_shift_connection; PBD::ScopedConnection _source_connection; PBD::ScopedConnection _model_contents_connection; + bool _ignore_shift; }; } /* namespace ARDOUR */ -- cgit v1.2.3