diff options
author | Carl Hetherington <carl@carlh.net> | 2010-12-09 21:34:46 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2010-12-09 21:34:46 +0000 |
commit | 5c23faaa0d86b2d1b18d4f03565bad55c410fb7a (patch) | |
tree | 673cafb6a98854a4683110e4e89449103403e3cf /libs/ardour/midi_region.cc | |
parent | 7d4e03e28e58a9315f163738f35559f57b099d37 (diff) |
Allow trim of midi regions to before the start of the source (better, this time). Fixes #3156.
git-svn-id: svn://localhost/ardour2/branches/3.0@8229 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/midi_region.cc')
-rw-r--r-- | libs/ardour/midi_region.cc | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc index f9fb791bad..26d43ba2a9 100644 --- a/libs/ardour/midi_region.cc +++ b/libs/ardour/midi_region.cc @@ -121,7 +121,7 @@ MidiRegion::set_position_internal (framepos_t pos, bool allow_bbt_recompute) BeatsFramesConverter old_converter(_session.tempo_map(), _position - _start); double length_beats = old_converter.from(_length); - Region::set_position_internal(pos, allow_bbt_recompute); + Region::set_position_internal (pos, allow_bbt_recompute); BeatsFramesConverter new_converter(_session.tempo_map(), pos - _start); @@ -306,9 +306,21 @@ MidiRegion::model_automation_state_changed (Evoral::Parameter const & p) } /* the source will have an iterator into the model, and that iterator will have been set up - for a given set of filtered_paramters, so now that we've changed that list we must invalidate + for a given set of filtered_parameters, so now that we've changed that list we must invalidate the iterator. */ Glib::Mutex::Lock lm (midi_source(0)->mutex()); midi_source(0)->invalidate (); } + +/** This is called when a trim drag has resulted in a -ve _start time for this region. + * Fix it up by adding some empty space to the source. + */ +void +MidiRegion::fix_negative_start () +{ + BeatsFramesConverter c (_session.tempo_map(), _position); + + model()->insert_silence_at_start (c.from (-_start)); + _start = 0; +} |