diff options
| author | nick_m <mainsbridge@gmail.com> | 2017-01-27 00:41:17 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2017-02-04 22:57:36 +1100 |
| commit | 59daffea1d78cb55b35fe19c135cc4ab472bd01d (patch) | |
| tree | 45e514f2e4f5a1935e360fd4fa3e2475ec217006 /libs/ardour/region_factory.cc | |
| parent | a21a414615505269bf770ad2358482e698e841af (diff) | |
rework snap
snap now fills in a struct (MusicFrame) which contins a snapped frame
along with a music divisor.
this gives useful information wrt magnetic snap which may or may not
have rounded to an exact musical position.
region position may now be set musically (using quarter notes for now).
this patch fixes several problems in the current code:
- dragging a list of music-locked regions now maintains correct
musical offsets within the list.
- splitting regions using magnetic snap works correctly (#7192)
- cut drag should now work correctly with magnetic snap.
- musical length of split midi regions is no longer frame based.
Diffstat (limited to 'libs/ardour/region_factory.cc')
| -rw-r--r-- | libs/ardour/region_factory.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libs/ardour/region_factory.cc b/libs/ardour/region_factory.cc index 16a9e02e37..78425db88c 100644 --- a/libs/ardour/region_factory.cc +++ b/libs/ardour/region_factory.cc @@ -46,7 +46,7 @@ std::map<std::string, PBD::ID> RegionFactory::region_name_map; RegionFactory::CompoundAssociations RegionFactory::_compound_associations; boost::shared_ptr<Region> -RegionFactory::create (boost::shared_ptr<const Region> region, bool announce, const int32_t sub_num) +RegionFactory::create (boost::shared_ptr<const Region> region, bool announce) { boost::shared_ptr<Region> ret; boost::shared_ptr<const AudioRegion> ar; @@ -54,7 +54,7 @@ RegionFactory::create (boost::shared_ptr<const Region> region, bool announce, co if ((ar = boost::dynamic_pointer_cast<const AudioRegion>(region)) != 0) { - ret = boost::shared_ptr<Region> (new AudioRegion (ar, 0, sub_num)); + ret = boost::shared_ptr<Region> (new AudioRegion (ar, MusicFrame (0, 0))); } else if ((mr = boost::dynamic_pointer_cast<const MidiRegion>(region)) != 0) { @@ -71,7 +71,7 @@ RegionFactory::create (boost::shared_ptr<const Region> region, bool announce, co source->set_ancestor_name(mr->sources().front()->name()); ret = mr->clone(source); } else { - ret = boost::shared_ptr<Region> (new MidiRegion (mr, 0, sub_num)); + ret = boost::shared_ptr<Region> (new MidiRegion (mr, MusicFrame (0, 0))); } } else { @@ -87,8 +87,6 @@ RegionFactory::create (boost::shared_ptr<const Region> region, bool announce, co ret->set_position_lock_style (MusicTime); } - ret->set_position (region->position(), sub_num); - /* pure copy constructor - no property list */ if (announce) { map_add (ret); @@ -144,7 +142,7 @@ RegionFactory::create (boost::shared_ptr<Region> region, const PropertyList& pli } boost::shared_ptr<Region> -RegionFactory::create (boost::shared_ptr<Region> region, frameoffset_t offset, const PropertyList& plist, bool announce, const int32_t sub_num) +RegionFactory::create (boost::shared_ptr<Region> region, MusicFrame offset, const PropertyList& plist, bool announce) { boost::shared_ptr<Region> ret; boost::shared_ptr<const AudioRegion> other_a; @@ -152,11 +150,11 @@ RegionFactory::create (boost::shared_ptr<Region> region, frameoffset_t offset, c if ((other_a = boost::dynamic_pointer_cast<AudioRegion>(region)) != 0) { - ret = boost::shared_ptr<Region> (new AudioRegion (other_a, offset, sub_num)); + ret = boost::shared_ptr<Region> (new AudioRegion (other_a, offset)); } else if ((other_m = boost::dynamic_pointer_cast<MidiRegion>(region)) != 0) { - ret = boost::shared_ptr<Region> (new MidiRegion (other_m, offset, sub_num)); + ret = boost::shared_ptr<Region> (new MidiRegion (other_m, offset)); } else { fatal << _("programming error: RegionFactory::create() called with unknown Region type") |