X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedl.C;h=a756e6e576bae9999d136b7d27ffe2ef6666c318;hb=7fa4ccc2c91d37f20f3618261e4cbaa9d5d3c740;hp=ebab4cd7ed3ea496273f600420b2f9995bf4f22b;hpb=a95193c3fd88733d184f2d460eca1fe6ddf8af28;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/edl.C b/cinelerra-5.1/cinelerra/edl.C
index ebab4cd7..a756e6e5 100644
--- a/cinelerra-5.1/cinelerra/edl.C
+++ b/cinelerra-5.1/cinelerra/edl.C
@@ -410,7 +410,7 @@ void EDL::copy_session(EDL *edl, int session_only)
 		session->copy(edl->session);
 	}
 
-	if( !session_only ) {
+	if( session_only <= 0 ) {
 		local_session->copy_from(edl->local_session);
 	}
 }
@@ -1546,6 +1546,10 @@ void EDL::set_proxy(int new_scale, int use_scaler,
 		Indexable *proxy_idxbl = proxy_assets->get(i);
 		proxy_idxbl->awindow_folder = awindow_folder;
 		Asset *proxy_asset = proxy_idxbl->is_asset ? assets->update((Asset *)proxy_idxbl) : 0;
+		if( proxy_asset && proxy_idxbl ) {
+			proxy_asset->width = proxy_idxbl->get_w();
+			proxy_asset->height = proxy_idxbl->get_h();
+		}
 		EDL *proxy_edl = !proxy_idxbl->is_asset ? (EDL *)proxy_idxbl : 0;
 // replace track contents
 		for( Track *track=tracks->first; track; track=track->next ) {
@@ -1608,6 +1612,12 @@ void EDL::add_proxy(int use_scaler,
 	}
 }
 
+Asset *EDL::get_proxy_asset()
+{
+	return awindow_folder == AW_PROXY_FOLDER ?
+		tracks->first->edits->first->asset : 0;
+}
+
 double EDL::get_cursor_position(int cursor_x, int pane_no)
 {
 	return (double)cursor_x * local_session->zoom_sample / session->sample_rate +