smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-17 12:16:30 +01:00
Code Issues Projects Releases Wiki Activity

Allow to create regions from sources with signals suspended

Browse source 
See also 65cc9264c8
This commit is contained in:
Robin Gareus 2021-05-01 14:36:51 +02:00
parent 80f6f152ee
commit 3e04e30e9e
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libs/ardour/ardour/region_factory.h
View file

@ -73,11 +73,11 @@ public:
/** create a region from a single Source */ /** create a region from a single Source */
static boost::shared_ptr<Region> create (boost::shared_ptr<Source>, static boost::shared_ptr<Region> create (boost::shared_ptr<Source>,
const PBD::PropertyList&, bool announce = true); const PBD::PropertyList&, bool announce = true, ThawList* tl = 0);
/** create a region from a multiple sources */ /** create a region from a multiple sources */
static boost::shared_ptr<Region> create (const SourceList &, static boost::shared_ptr<Region> create (const SourceList &,
const PBD::PropertyList&, bool announce = true); const PBD::PropertyList&, bool announce = true, ThawList* tl = 0);
/** create a copy of \p other starting at zero within \p other's sources */ /** create a copy of \p other starting at zero within \p other's sources */
static boost::shared_ptr<Region> create (boost::shared_ptr<Region> other, static boost::shared_ptr<Region> create (boost::shared_ptr<Region> other,
const PBD::PropertyList&, bool announce = true, ThawList* tl = 0); const PBD::PropertyList&, bool announce = true, ThawList* tl = 0);
@ -86,7 +86,7 @@ public:
const PBD::PropertyList&, bool announce = true, ThawList* tl = 0); const PBD::PropertyList&, bool announce = true, ThawList* tl = 0);
/** create a "copy" of \p other but using a different set of sources \p srcs */ /** create a "copy" of \p other but using a different set of sources \p srcs */
static boost::shared_ptr<Region> create (boost::shared_ptr<Region> other, const SourceList& srcs, static boost::shared_ptr<Region> create (boost::shared_ptr<Region> other, const SourceList& srcs,
const PBD::PropertyList&, bool announce = true); const PBD::PropertyList&, bool announce = true, ThawList* tl = 0);
/** create a region with no sources, using XML state */ /** create a region with no sources, using XML state */
static boost::shared_ptr<Region> create (Session&, XMLNode&, bool); static boost::shared_ptr<Region> create (Session&, XMLNode&, bool);

18
libs/ardour/region_factory.cc
View file

@ -196,7 +196,7 @@ RegionFactory::create (boost::shared_ptr<Region> region, MusicSample offset, con
} }
boost::shared_ptr<Region> boost::shared_ptr<Region>
RegionFactory::create (boost::shared_ptr<Region> region, const SourceList& srcs, const PropertyList& plist, bool announce) RegionFactory::create (boost::shared_ptr<Region> region, const SourceList& srcs, const PropertyList& plist, bool announce, ThawList* tl)
{ {
boost::shared_ptr<Region> ret; boost::shared_ptr<Region> ret;
boost::shared_ptr<const AudioRegion> other; boost::shared_ptr<const AudioRegion> other;
@ -218,6 +218,11 @@ RegionFactory::create (boost::shared_ptr<Region> region, const SourceList& srcs,
} }
if (ret) { if (ret) {
if (tl) {
ret->suspend_property_changes ();
tl->add (ret);
}
ret->apply_changes (plist); ret->apply_changes (plist);
if (ret->session().config.get_glue_new_regions_to_bars_and_beats() && ret->position_lock_style() != MusicTime) { if (ret->session().config.get_glue_new_regions_to_bars_and_beats() && ret->position_lock_style() != MusicTime) {
@ -235,15 +240,15 @@ RegionFactory::create (boost::shared_ptr<Region> region, const SourceList& srcs,
} }
boost::shared_ptr<Region> boost::shared_ptr<Region>
RegionFactory::create (boost::shared_ptr<Source> src, const PropertyList& plist, bool announce) RegionFactory::create (boost::shared_ptr<Source> src, const PropertyList& plist, bool announce, ThawList* tl)
{ {
SourceList srcs; SourceList srcs;
srcs.push_back (src); srcs.push_back (src);
return create (srcs, plist, announce); return create (srcs, plist, announce, tl);
} }
boost::shared_ptr<Region> boost::shared_ptr<Region>
RegionFactory::create (const SourceList& srcs, const PropertyList& plist, bool announce) RegionFactory::create (const SourceList& srcs, const PropertyList& plist, bool announce, ThawList* tl)
{ {
boost::shared_ptr<Region> ret; boost::shared_ptr<Region> ret;
boost::shared_ptr<AudioSource> as; boost::shared_ptr<AudioSource> as;
@ -260,6 +265,11 @@ RegionFactory::create (const SourceList& srcs, const PropertyList& plist, bool a
} }
if (ret) { if (ret) {
if (tl) {
ret->suspend_property_changes ();
tl->add (ret);
}
ret->apply_changes (plist); ret->apply_changes (plist);
if (ret->session().config.get_glue_new_regions_to_bars_and_beats() && ret->position_lock_style() != MusicTime) { if (ret->session().config.get_glue_new_regions_to_bars_and_beats() && ret->position_lock_style() != MusicTime) {