summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour
diff options
context:
space:
mode:
authornick_m <mainsbridge@gmail.com>2017-03-04 11:28:49 +1100
committernick_m <mainsbridge@gmail.com>2017-03-04 11:28:49 +1100
commite8b5b4fcf3e9b755c953a6e25a343640d64fe3d9 (patch)
tree247d52b9b2ed84121d49599daa3a51a70a61b5b0 /libs/ardour/ardour
parent645441d093dd3ff92f502048ab1c50be058fb192 (diff)
offset linked regions to compensate for negative start after trim drag.
- should fix 7105
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r--libs/ardour/ardour/midi_model.h1
-rw-r--r--libs/ardour/ardour/midi_region.h3
2 files changed, 4 insertions, 0 deletions
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<void> ContentsChanged;
+ PBD::Signal1<void, double> ContentsShifted;
boost::shared_ptr<const MidiSource> midi_source ();
void set_midi_source (boost::shared_ptr<MidiSource>);
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<Evoral::Parameter> _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 */