X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedl.C;h=154f929ae01e7964286043748126174a792059e8;hb=8bd72f90925843be9ab9182c89761ee0640e7873;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..154f929a 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);
 	}
 }
@@ -1608,6 +1608,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 +