X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedit.C;h=198a0fdfc0f62e435cb7cf2347f1132858c1f82e;hb=a401d3a0c7e80c973bdb3b0d807f2e93cdae8036;hp=9eb0d9d8f885aedabd0c9aac3d745a6b9a97e64d;hpb=8ab335aafbd648cad728f18e01153715a4e59eef;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/edit.C b/cinelerra-5.1/cinelerra/edit.C
index 9eb0d9d8..198a0fdf 100644
--- a/cinelerra-5.1/cinelerra/edit.C
+++ b/cinelerra-5.1/cinelerra/edit.C
@@ -32,7 +32,6 @@
 #include "localsession.h"
 #include "plugin.h"
 #include "mainsession.h"
-#include "nestededls.h"
 #include "strack.h"
 #include "trackcanvas.h"
 #include "tracks.h"
@@ -242,7 +241,7 @@ int Edit::silence()
 
 void Edit::copy_from(Edit *edit)
 {
-	this->nested_edl = edl->nested_edls->get_copy(edit->nested_edl);
+	this->nested_edl = edl->nested_edls.get_nested(edit->nested_edl);
 	this->asset = edl->assets->update(edit->asset);
 	this->startsource = edit->startsource;
 	this->startproject = edit->startproject;
@@ -824,3 +823,23 @@ int Edit::select_handle(float view_start, float zoom_units, int cursor_x, int cu
 	return 0;
 }
 
+void Edit::get_title(char *title)
+{
+	if( user_title[0] ) {
+		strcpy(title, user_title);
+		return;
+	}
+	Indexable *idxbl = asset ? (Indexable*)asset : (Indexable*)nested_edl;
+	if( !idxbl ) {
+		title[0] = 0;
+		return;
+	}
+	FileSystem fs;
+	fs.extract_name(title, idxbl->path);
+	if( asset || track->data_type == TRACK_AUDIO ) {
+		char number[BCSTRLEN];
+		sprintf(number, " #%d", channel + 1);
+		strcat(title, number);
+	}
+}
+