ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

remove glue-new-regions-to-beats option, add new tracks follow session time option

This commit is contained in:
Paul Davis 2023-07-22 07:37:50 -06:00
parent 908c530834
commit 08683674ce
3 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/ardour/session_configuration_vars.h
View File

@ -63,7 +63,7 @@ CONFIG_VARIABLE (bool, timecode_offset_negative, "timecode-offset-negative", tru
CONFIG_VARIABLE (std::string, slave_timecode_offset, "slave-timecode-offset", " 00:00:00:00")
CONFIG_VARIABLE (std::string, timecode_generator_offset, "timecode-generator-offset", " 00:00:00:00")
CONFIG_VARIABLE (bool, midi_copy_is_fork, "midi-copy-is-fork", true)
CONFIG_VARIABLE (bool, glue_new_regions_to_bars_and_beats, "glue-new-regions-to-bars-and-beats", false)
CONFIG_VARIABLE (bool, tracks_follow_session_time, "tracks-follow-session-time", false)
CONFIG_VARIABLE (bool, realtime_export, "realtime-export", false)
/* Video-settings are saved with the session and belong to the session.

3
libs/ardour/audio_region_importer.cc
View File

@ -313,9 +313,6 @@ AudioRegionImporter::prepare_region ()
// create region and update XML
std::shared_ptr<Region> r = RegionFactory::create (source_list, xml_region);
if (session.config.get_glue_new_regions_to_bars_and_beats ()) {
r->set_position_time_domain (Temporal::BeatTime);
}
region.push_back (r);
if (*region.begin()) {
xml_region = (*region.begin())->get_state();

20
libs/ardour/region_factory.cc
View File

@ -91,10 +91,6 @@ RegionFactory::create (std::shared_ptr<const Region> region, bool announce, bool
ret->set_name (new_region_name (ret->name ()));
if (ret->session().config.get_glue_new_regions_to_bars_and_beats() && ret->position_time_domain() != Temporal::BeatTime) {
ret->set_position_time_domain (Temporal::BeatTime);
}
/* pure copy constructor - no property list */
if (announce) {
map_add (ret);
@ -133,10 +129,6 @@ RegionFactory::create (std::shared_ptr<Region> region, const PropertyList& plist
ret->apply_changes (plist);
if (ret->session().config.get_glue_new_regions_to_bars_and_beats() && ret->position_time_domain() != Temporal::BeatTime) {
ret->set_position_time_domain (Temporal::BeatTime);
}
if (announce) {
map_add (ret);
CheckNewRegion (ret); /* EMIT SIGNAL */
@ -173,10 +165,6 @@ RegionFactory::create (std::shared_ptr<Region> region, timecnt_t const & offset,
}
ret->apply_changes (plist);
if (ret->session().config.get_glue_new_regions_to_bars_and_beats() && ret->position_time_domain() != Temporal::BeatTime) {
ret->set_position_time_domain (Temporal::BeatTime);
}
if (announce) {
map_add (ret);
CheckNewRegion (ret); /* EMIT SIGNAL */
@ -215,10 +203,6 @@ RegionFactory::create (std::shared_ptr<Region> region, const SourceList& srcs, c
ret->apply_changes (plist);
if (ret->session().config.get_glue_new_regions_to_bars_and_beats() && ret->position_time_domain() != Temporal::BeatTime) {
ret->set_position_time_domain (Temporal::BeatTime);
}
if (announce) {
map_add (ret);
CheckNewRegion (ret); /* EMIT SIGNAL */
@ -258,10 +242,6 @@ RegionFactory::create (const SourceList& srcs, const PropertyList& plist, bool a
ret->apply_changes (plist);
if (ret->session().config.get_glue_new_regions_to_bars_and_beats() && ret->position_time_domain() != Temporal::BeatTime) {
ret->set_position_time_domain (Temporal::BeatTime);
}
if (announce) {
map_add (ret);
CheckNewRegion (ret); /* EMIT SIGNAL */