X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedl.C;h=cb080aca25103b8349062e069f7200cff3891614;hp=5df16099ea7de304e2ca7f7f582e03b288c7db4f;hb=b2d226c1f41e84bbb3af93ebc0aa89f98ec0fd52;hpb=48a6854a1ca58aa291ffc6fe3a48807492dfbef7

diff --git a/cinelerra-5.1/cinelerra/edl.C b/cinelerra-5.1/cinelerra/edl.C
index 5df16099..cb080aca 100644
--- a/cinelerra-5.1/cinelerra/edl.C
+++ b/cinelerra-5.1/cinelerra/edl.C
@@ -601,7 +601,7 @@ void EDL::copy_indexables(EDL *edl)
 	}
 }
 
-EDL *EDL::new_nested_edl(EDL *edl, const char *path)
+EDL *EDL::new_nested_clip(EDL *edl, const char *path)
 {
 	EDL *nested = new EDL;  // no parent for nested edl
 	nested->create_objects();
@@ -614,19 +614,14 @@ EDL *EDL::new_nested_edl(EDL *edl, const char *path)
 	return nested;
 }
 
-EDL *EDL::get_nested_edl()
+EDL *EDL::get_nested_edl(const char *path)
 {
-	Track *track = tracks->first;
-	Edit *edit = track ? track->edits->first : 0;
-	EDL *nested = edit && !edit->next && !edit->asset ? edit->nested_edl : 0;
-	while( nested && (track=track->next)!=0 ) {
-		Edit *edit = track->edits->first;
-		if( !edit || edit->next ||
-		    ( edit->nested_edl != nested &&
-		      strcmp(edit->nested_edl->path, nested->path) ) )
-			nested = 0;
+	for( int i=0; i<nested_edls.size(); ++i ) {
+		EDL *nested_edl = nested_edls[i];
+		if( !strcmp(path, nested_edl->path) )
+			return nested_edl;
 	}
-	return nested;
+	return 0;
 }
 
 
@@ -642,8 +637,8 @@ void EDL::create_nested(EDL *nested)
 {
 	int video_tracks = 0, audio_tracks = 0;
 	for( Track *track=nested->tracks->first; track!=0; track=track->next ) {
-		if( track->data_type == TRACK_VIDEO && track->is_armed() ) ++video_tracks;
-		if( track->data_type == TRACK_AUDIO && track->is_armed() ) ++audio_tracks;
+		if( track->data_type == TRACK_VIDEO && track->play ) ++video_tracks;
+		if( track->data_type == TRACK_AUDIO && track->play ) ++audio_tracks;
 	}
 // renderengine properties
 	if( video_tracks > 0 )