diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-06-16 00:18:27 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-07-10 02:18:36 +1000 |
| commit | 94e0a15325278ec26dbeba4990a0e883db859338 (patch) | |
| tree | e4d97368112f92ba8a66c673b68c68f7a76b025a /libs/ardour/region_factory.cc | |
| parent | 2d5238d87581bc0ff9dcaaa8aad9e255b5d9c370 (diff) | |
Exact beat - provide audio->music mapping for region split.
- for those not in the know, this series provides a way to
remove the temporal distortion introduced when using an
audio frame-based gui for music-locked objects.
In short, the gui uses an audio frame representation to move
objects. It displays the object using frame_at_beat(), quantizing
the time value to audio frames. This is fine until the user selects
that frame but expects it to be interpreted as a beat.
Thus beat_at_frame() would not produce the user-expected beat
(temporal quantization error of up to 0.5 audio samples).
This is one method of mapping audio time to music time accurately.
Diffstat (limited to 'libs/ardour/region_factory.cc')
| -rw-r--r-- | libs/ardour/region_factory.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libs/ardour/region_factory.cc b/libs/ardour/region_factory.cc index 549d0a252e..fab9d8aaa8 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) +RegionFactory::create (boost::shared_ptr<const Region> region, bool announce, const int32_t& sub_num) { 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) if ((ar = boost::dynamic_pointer_cast<const AudioRegion>(region)) != 0) { - ret = boost::shared_ptr<Region> (new AudioRegion (ar, 0)); + ret = boost::shared_ptr<Region> (new AudioRegion (ar, 0, sub_num)); } 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) source->set_ancestor_name(mr->sources().front()->name()); ret = mr->clone(source); } else { - ret = boost::shared_ptr<Region> (new MidiRegion (mr, 0)); + ret = boost::shared_ptr<Region> (new MidiRegion (mr, 0, sub_num)); } } else { @@ -144,7 +144,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) +RegionFactory::create (boost::shared_ptr<Region> region, frameoffset_t offset, const PropertyList& plist, bool announce, const int32_t& sub_num) { boost::shared_ptr<Region> ret; boost::shared_ptr<const AudioRegion> other_a; @@ -152,11 +152,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)); + ret = boost::shared_ptr<Region> (new AudioRegion (other_a, offset, sub_num)); } else if ((other_m = boost::dynamic_pointer_cast<MidiRegion>(region)) != 0) { - ret = boost::shared_ptr<Region> (new MidiRegion (other_m, offset)); + ret = boost::shared_ptr<Region> (new MidiRegion (other_m, offset, sub_num)); } else { fatal << _("programming error: RegionFactory::create() called with unknown Region type") |