X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fedl.C;h=cbde2640730df60673f6099fcd9e79f13050e544;hb=bd40a11178ed791d8c163877d3c28e5045148c62;hp=d3f19b2353652f04390b1fcbc6be766afb550f0e;hpb=976d56536456148f6d14a2c12630c20e367abbe1;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/edl.C b/cinelerra-5.1/cinelerra/edl.C
index d3f19b23..cbde2640 100644
--- a/cinelerra-5.1/cinelerra/edl.C
+++ b/cinelerra-5.1/cinelerra/edl.C
@@ -1494,16 +1494,15 @@ void EDL::rescale_proxy(int orig_scale, int new_scale)
 	}
 }
 
-void EDL::set_proxy(int use_scaler, int new_scale, int auto_scale, int beep,
+void EDL::set_proxy(int new_scale, int use_scaler,
 	ArrayList<Indexable*> *orig_assets, ArrayList<Indexable*> *proxy_assets)
 {
-	int orig_use_scaler = session->proxy_use_scaler;
 	int orig_scale = session->proxy_scale;
+	int orig_use_scaler = session->proxy_use_scaler;
+
 // rescale to full size asset in read_frame
-	session->proxy_use_scaler = use_scaler;
 	session->proxy_scale = new_scale;
-	session->proxy_auto_scale = auto_scale;
-	session->proxy_beep = beep;
+	session->proxy_use_scaler = use_scaler;
 
 	if( use_scaler ) {
 		for( int i=0; i<proxy_assets->size(); ++i ) {
@@ -1586,3 +1585,10 @@ void EDL::add_proxy(int use_scaler,
 	}
 }
 
+double EDL::get_cursor_position(int cursor_x, int pane_no)
+{
+	return (double)cursor_x * local_session->zoom_sample / session->sample_rate +
+		(double)local_session->view_start[pane_no] *
+			local_session->zoom_sample / session->sample_rate;
+}
+