From 08683674cee6d9149bbf51ad1fb3e0f6ee1795a0 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sat, 22 Jul 2023 07:37:50 -0600 Subject: [PATCH] remove glue-new-regions-to-beats option, add new tracks follow session time option --- .../ardour/session_configuration_vars.h | 2 +- libs/ardour/audio_region_importer.cc | 3 --- libs/ardour/region_factory.cc | 20 ------------------- 3 files changed, 1 insertion(+), 24 deletions(-) diff --git a/libs/ardour/ardour/session_configuration_vars.h b/libs/ardour/ardour/session_configuration_vars.h index c6c5752044..0b59a49423 100644 --- a/libs/ardour/ardour/session_configuration_vars.h +++ b/libs/ardour/ardour/session_configuration_vars.h @@ -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. diff --git a/libs/ardour/audio_region_importer.cc b/libs/ardour/audio_region_importer.cc index a850fd7a8e..765caddc36 100644 --- a/libs/ardour/audio_region_importer.cc +++ b/libs/ardour/audio_region_importer.cc @@ -313,9 +313,6 @@ AudioRegionImporter::prepare_region () // create region and update XML std::shared_ptr 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(); diff --git a/libs/ardour/region_factory.cc b/libs/ardour/region_factory.cc index df1fea06bd..c1726304c8 100644 --- a/libs/ardour/region_factory.cc +++ b/libs/ardour/region_factory.cc @@ -91,10 +91,6 @@ RegionFactory::create (std::shared_ptr 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, 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, 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, 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 */