From 886bebe342daf771b384566b6ff2f3ea32ac24c0 Mon Sep 17 00:00:00 2001 From: GZharun Date: Fri, 9 Jan 2015 10:45:53 +0200 Subject: [PATCH] Revert "[Summary] Fixed bug. Not specified in TT. Ranges which coincided with region borders (achieved by the context menu commands like Move Range Start/End ... ) used to cut a small byte of region which border coincided." This reverts commit 3b4d7ef1b4379a29a7bd0dcc6d07b6909c29e553. --- libs/ardour/audio_playlist.cc | 13 ------------- libs/ardour/playlist.cc | 23 +++-------------------- 2 files changed, 3 insertions(+), 33 deletions(-) diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc index d34c67ff17..6ef4ec6454 100644 --- a/libs/ardour/audio_playlist.cc +++ b/libs/ardour/audio_playlist.cc @@ -85,19 +85,6 @@ AudioPlaylist::AudioPlaylist (boost::shared_ptr other, fram framecnt_t fade_in = 64; framecnt_t fade_out = 64; - /* coverage will return OverlapStart if the start/end coincides - with the end/start point. we do not add such a region to the new playlist, - so catch this special case. - */ - - if (region->first_frame() >= end) { - continue; - } - - if (region->last_frame() <= start) { - continue; - } - switch (region->coverage (start, end)) { case Evoral::OverlapNone: continue; diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc index 204ca5cbdc..ff2f524398 100644 --- a/libs/ardour/playlist.cc +++ b/libs/ardour/playlist.cc @@ -210,19 +210,6 @@ Playlist::Playlist (boost::shared_ptr other, framepos_t start, f region = *i; - /* coverage will return OverlapStart if the start/end coincides - with the end/start point. we do not add such a region to the new playlist, - so catch this special case. - */ - - if (region->first_frame() >= end) { - continue; - } - - if (region->last_frame() <= start) { - continue; - } - overlap = region->coverage (start, end); switch (overlap) { @@ -927,7 +914,7 @@ Playlist::flush_notifications (bool from_undo) current = *i; - if (current->first_frame() >= start && current->last_frame() <= end) { + if (current->first_frame() >= start && current->last_frame() < end) { if (cutting) { remove_region_internal (current); @@ -936,18 +923,14 @@ Playlist::flush_notifications (bool from_undo) continue; } - /* coverage will return OverlapStart if the start/end coincides - with the end/start point. we do not partition such a region, + /* coverage will return OverlapStart if the start coincides + with the end point. we do not partition such a region, so catch this special case. */ if (current->first_frame() >= end) { continue; } - - if (current->last_frame() <= start) { - continue; - } if ((overlap = current->coverage (start, end)) == Evoral::OverlapNone) { continue;