ardour/livetrax
13
0
Fork 0
Code

Fix missing note divisor when creating regions, ensure an existing musical time is not altered.

Browse Source
This commit is contained in:
nick_m 2016-07-06 04:36:48 +10:00
parent 5f0ab71989
commit 8a676d2bd4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/ardour/region_factory.cc
View File

@ -83,11 +83,11 @@ RegionFactory::create (boost::shared_ptr<const Region> region, bool announce, co
if (ret) { if (ret) {
ret->set_name (new_region_name(ret->name())); ret->set_name (new_region_name(ret->name()));
if (ret->session().config.get_glue_new_regions_to_bars_and_beats ()) { if (ret->session().config.get_glue_new_regions_to_bars_and_beats() && ret->position_lock_style() != MusicTime) {
ret->set_position_lock_style (MusicTime); ret->set_position_lock_style (MusicTime);
} }
ret->set_position (region->position()); ret->set_position (region->position(), sub_num);
/* pure copy constructor - no property list */ /* pure copy constructor - no property list */
if (announce) { if (announce) {
@ -127,7 +127,7 @@ RegionFactory::create (boost::shared_ptr<Region> region, const PropertyList& pli
if (ret) { if (ret) {
ret->apply_changes (plist); ret->apply_changes (plist);
if (ret->session().config.get_glue_new_regions_to_bars_and_beats ()) { if (ret->session().config.get_glue_new_regions_to_bars_and_beats() && ret->position_lock_style() != MusicTime) {
ret->set_position_lock_style (MusicTime); ret->set_position_lock_style (MusicTime);
} }
@ -168,7 +168,7 @@ RegionFactory::create (boost::shared_ptr<Region> region, frameoffset_t offset, c
if (ret) { if (ret) {
ret->apply_changes (plist); ret->apply_changes (plist);
if (ret->session().config.get_glue_new_regions_to_bars_and_beats ()) { if (ret->session().config.get_glue_new_regions_to_bars_and_beats() && ret->position_lock_style() != MusicTime) {
ret->set_position_lock_style (MusicTime); ret->set_position_lock_style (MusicTime);
} }
@ -209,7 +209,7 @@ RegionFactory::create (boost::shared_ptr<Region> region, const SourceList& srcs,
if (ret) { if (ret) {
ret->apply_changes (plist); ret->apply_changes (plist);
if (ret->session().config.get_glue_new_regions_to_bars_and_beats ()) { if (ret->session().config.get_glue_new_regions_to_bars_and_beats() && ret->position_lock_style() != MusicTime) {
ret->set_position_lock_style (MusicTime); ret->set_position_lock_style (MusicTime);
} }
@ -253,7 +253,7 @@ RegionFactory::create (const SourceList& srcs, const PropertyList& plist, bool a
if (ret) { if (ret) {
ret->apply_changes (plist); ret->apply_changes (plist);
if (ret->session().config.get_glue_new_regions_to_bars_and_beats ()) { if (ret->session().config.get_glue_new_regions_to_bars_and_beats() && ret->position_lock_style() != MusicTime) {
ret->set_position_lock_style (MusicTime); ret->set_position_lock_style (MusicTime);
} }