attempt to remove confusion and errors caused by unclear semantics of _is_embedded for FileSources; member renamed _within_session, and is now ALWAYS determined by the _path of the FileSource, never by the creator

git-svn-id: svn://localhost/ardour2/branches/3.0@6213 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 6 insertions, 4 deletions

diff --git a/libs/ardour/source.cc b/libs/ardour/source.cc
index 790b7f6c3e..958bc2c1b5 100644
--- a/libs/ardour/source.cc
+++ b/libs/ardour/source.cc
@@ -239,10 +239,12 @@ Source::check_for_analysis_data_on_disk ()
 void
 Source::mark_for_remove ()
 {
-	// This operation is not allowed for sources for destructive tracks or embedded files.
-	// Fortunately mark_for_remove() is never called for embedded files. This function
-	// must be fixed if that ever happens.
-	if (_flags & Destructive) {
+	// This operation is not allowed for sources for destructive tracks or out-of-session files.
+
+	/* XXX need a way to detect _within_session() condition here - move it from FileSource? 
+	 */
+
+	if ((_flags & Destructive)) { 
 		return;
 	}