From 63677347c9df79f91fbaa32e1280ad3b1ee81cca Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 18 Oct 2022 18:08:44 -0600 Subject: [PATCH] change pingback URL and no longer send OS release or machine info --- libs/ardour/ardour/rc_configuration_vars.h | 4 +--- libs/ardour/midi_region.cc | 4 ++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h index 0ef7e54943..80c1d6d318 100644 --- a/libs/ardour/ardour/rc_configuration_vars.h +++ b/libs/ardour/ardour/rc_configuration_vars.h @@ -260,9 +260,7 @@ CONFIG_VARIABLE (DenormalModel, denormal_model, "denormal-model", DenormalFTZDAZ /* web addresses used in the program */ -CONFIG_VARIABLE (std::string, osx_pingback_url, "osx-pingback-url", "http://community.ardour.org/pingback/osx/") -CONFIG_VARIABLE (std::string, linux_pingback_url, "linux-pingback-url", "http://community.ardour.org/pingback/linux/") -CONFIG_VARIABLE (std::string, windows_pingback_url, "windows-pingback-url", "http://community.ardour.org/pingback/windows/") +CONFIG_VARIABLE (std::string, pingback_url, "pingback-url", "http://community.ardour.org/pingback/ignored/") CONFIG_VARIABLE (std::string, tutorial_manual_url, "tutorial-manual-url", "http://ardour.org/tutorial") CONFIG_VARIABLE (std::string, reference_manual_url, "reference-manual-url", "http://manual.ardour.org/") CONFIG_VARIABLE (std::string, updates_url, "updates-url", "http://ardour.org/whatsnew.html") diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc index be877ac4cd..d4311e7bff 100644 --- a/libs/ardour/midi_region.cc +++ b/libs/ardour/midi_region.cc @@ -564,10 +564,14 @@ MidiRegion::merge (boost::shared_ptr other_region) for (Evoral::Sequence::const_iterator e = other->begin(); e != other->end(); ++e) { + std::cerr << "event " << *e << " @ " << e->time().str() << " vs " << other_region_start.str() << " .. " << other_region_end.str() << " other = " << other << std::endl; + if (e->time() < other_region_start) { continue; } + /* other_region_end is an exclusive end, not inclusive */ + if (e->time() >= other_region_end) { break; }