diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-12-20 18:47:18 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-12-20 18:47:18 +0000 |
| commit | 1fd105fbd43a7383702d89a1db48aa17e100ed3f (patch) | |
| tree | ec90e8fc5b6fc210f9e81a402caf03307729ad73 /libs/ardour | |
| parent | 76e7a89a512fd43b1cf18ab802cbcc913b5c5a6d (diff) | |
Fix split of midi regions after tempo / meter changes.
git-svn-id: svn://localhost/ardour2/branches/3.0@8308 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/midi_region.cc | 4 | ||||
| -rw-r--r-- | libs/ardour/playlist.cc | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc index 02d9f7d398..d8373bac86 100644 --- a/libs/ardour/midi_region.cc +++ b/libs/ardour/midi_region.cc @@ -141,10 +141,8 @@ MidiRegion::set_length_internal (framecnt_t len) void MidiRegion::update_length_beats () { - cerr << name() << " Updating length beats, currently = " << _length_beats << " w/length = " << _length << endl; - BeatsFramesConverter converter (_session.tempo_map(), _position); + BeatsFramesConverter converter (_session.tempo_map(), _position - _start); _length_beats = converter.from (_length); - cerr << "\tnew value: " << _length_beats << endl; } void diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc index 971ed8b2e8..7e393a7718 100644 --- a/libs/ardour/playlist.cc +++ b/libs/ardour/playlist.cc @@ -1397,7 +1397,8 @@ Playlist::_split_region (boost::shared_ptr<Region> region, framepos_t playlist_p { PropertyList plist; - + + plist.add (Properties::position, region->position ()); plist.add (Properties::length, before); plist.add (Properties::name, before_name); plist.add (Properties::left_of_split, true); @@ -1413,7 +1414,8 @@ Playlist::_split_region (boost::shared_ptr<Region> region, framepos_t playlist_p { PropertyList plist; - + + plist.add (Properties::position, region->position() + before); plist.add (Properties::length, after); plist.add (Properties::name, after_name); plist.add (Properties::right_of_split, true); |