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

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index c4e7a7cb..49709028 100644
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -2492,8 +2492,6 @@ int MWindow::to_proxy(Asset *asset, int new_scale, int new_use_scaler)
 		for( int i=0,n=edl->nested_edls.size(); i<n; ++i ) {
 			EDL *orig_nested = edl->nested_edls[i];
 			char new_path[BCTEXTLEN];
-			if( !ProxyRender::from_proxy_path(new_path, orig_nested, proxy_scale) )
-				continue;
 			proxy_render.to_proxy_path(new_path, orig_nested, proxy_scale);
 // test if proxy asset was already added to proxy_assets
 			int got_it = 0;
@@ -3431,7 +3429,7 @@ int MWindow::get_hash_color(Edit *edit)
 	char path[BCTEXTLEN];
 	if( !edit->asset || edit->track->data_type != TRACK_VIDEO ||
 	    edl->session->proxy_scale == 1 ||
-	    ProxyRender::from_proxy_path(path, idxbl, edl->session->proxy_scale) )
+	    ProxyRender::from_proxy_path(path, (Asset*)idxbl, edl->session->proxy_scale) )
 		strcpy(path, idxbl->path);
 	char *cp = strrchr(path, '/');
 	cp = !cp ? path : cp+1;
@@ -4004,7 +4002,7 @@ void MWindow::clip_to_media()
 		char *bp = strrchr(clip->local_session->clip_title, '/');
 		bp = bp ? bp+1 : clip->local_session->clip_title;
 		cp += snprintf(cp, ep-cp, "%s", bp);
-		EDL *nested = edl->new_nested_edl(clip, path);
+		EDL *nested = edl->new_nested_clip(clip, path);
 		edl->clips.remove(clip);
 		clip->remove_user();
 		mainindexes->add_indexable(nested);
@@ -5015,7 +5013,7 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra
 				track->track_h = edl->session->output_h;
 			}
 			else if( delete_tracks )
-				edl->tracks->delete_track(track);
+				edl->tracks->delete_track(track, 0);
 		}
 		edl->retrack();
 		edl->resample(old_framerate, session->frame_rate, TRACK_VIDEO);
@@ -5051,7 +5049,7 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra
 						delete edit;
 				}
 				if( !track->edits->first )
-					edl->tracks->delete_track(track);
+					edl->tracks->delete_track(track, 0);
 			}
 		}
 		edl->rechannel();