X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fclippopup.C;h=df439311dc32d95819f75335a8f11b0db4cad808;hb=6853a2c0b04cc5ff4e87a2022c914227f925cb7f;hp=ef291f195c3c58e2cc56ac88a4028e9c314412cb;hpb=f007a674187f11ab58a5aebfe1eec27a90398bcb;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/clippopup.C b/cinelerra-5.1/cinelerra/clippopup.C
index ef291f19..df439311 100644
--- a/cinelerra-5.1/cinelerra/clippopup.C
+++ b/cinelerra-5.1/cinelerra/clippopup.C
@@ -32,6 +32,7 @@
 #include "edit.h"
 #include "edits.h"
 #include "edl.h"
+#include "edlsession.h"
 #include "filexml.h"
 #include "language.h"
 #include "localsession.h"
@@ -429,38 +430,38 @@ int ClipPopupNest::handle_event()
 {
 	MWindowGUI *gui = mwindow->gui;
 	gui->lock_window("ClipPopupNest::handle_event 1");
-	if( mwindow->session->drag_clips->total > 0 ) {
+	if( mwindow->edl->session->proxy_scale != 1 ) {
+		eprintf("Nesting not allowed when proxy scale != 1");
+	}
+	else if( mwindow->session->drag_clips->total > 0 ) {
 		EDL *edl = mwindow->edl;
+		time_t dt;      time(&dt);
+		struct tm dtm;  localtime_r(&dt, &dtm);
+		char path[BCSTRLEN];
+		sprintf(path, _("Nested_%02d%02d%02d-%02d%02d%02d"),
+			dtm.tm_year+1900, dtm.tm_mon+1, dtm.tm_mday,
+			dtm.tm_hour, dtm.tm_min, dtm.tm_sec);
 		EDL *clip = mwindow->session->drag_clips->values[0];
-		EDL *new_clip = new EDL(edl);
-		new_clip->create_objects();
-		new_clip->copy_all(clip);
+		EDL *nested = edl->new_nested(clip, path);
+		EDL *new_clip = edl->create_nested_clip(nested);
 		new_clip->awindow_folder = AW_CLIP_FOLDER;
+                sprintf(new_clip->local_session->clip_icon,
+                        "clip_%02d%02d%02d-%02d%02d%02d.png",
+                        dtm.tm_year+1900, dtm.tm_mon+1, dtm.tm_mday,
+                        dtm.tm_hour, dtm.tm_min, dtm.tm_sec);
 		snprintf(new_clip->local_session->clip_title,
 			sizeof(new_clip->local_session->clip_title),
 			_("Nested: %s"), clip->local_session->clip_title);
 		strcpy(new_clip->local_session->clip_notes,
 			clip->local_session->clip_notes);
-		time_t dt;	time(&dt);
-		struct tm dtm;	localtime_r(&dt, &dtm);
-		sprintf(new_clip->local_session->clip_icon,
-			"clip_%02d%02d%02d-%02d%02d%02d.png",
-			dtm.tm_year+1900, dtm.tm_mon+1, dtm.tm_mday,
-			dtm.tm_hour, dtm.tm_min, dtm.tm_sec);
-		char path[BCSTRLEN];
-		sprintf(path, _("Nested_%02d%02d%02d-%02d%02d%02d"),
-			dtm.tm_year+1900, dtm.tm_mon+1, dtm.tm_mday,
-			dtm.tm_hour, dtm.tm_min, dtm.tm_sec);
-		EDL *clip_edl = edl->new_nested(new_clip, path);
-		new_clip->remove_user();
 		int idx = edl->clips.number_of(clip);
 		if( idx >= 0 ) {
-			edl->clips[idx] = clip_edl;
+			edl->clips[idx] = new_clip;
 			clip->remove_user();
 		}
 		else
-			edl->clips.append(clip_edl);
-		mwindow->mainindexes->add_next_asset(0, clip_edl);
+			edl->clips.append(new_clip);
+		mwindow->mainindexes->add_next_asset(0, nested);
 		mwindow->mainindexes->start_build();
 		popup->gui->async_update_assets();
 	}
@@ -491,7 +492,9 @@ int ClipPopupUnNest::handle_event()
 		nested_edl = edit && !edit->next && !edit->asset ? edit->nested_edl : 0;
 		while( nested_edl && (track=track->next)!=0 ) {
 			Edit *edit = track->edits->first;
-			if( !edit || edit->next || edit->nested_edl != nested_edl )
+			if( !edit || edit->next ||
+			    ( edit->nested_edl != nested_edl &&
+			      strcmp(edit->nested_edl->path, nested_edl->path) ) )
 				nested_edl = 0;
 		}
 		if( nested_edl ) {