4 bt fixes, xft unrefd font fix, add: find in resources, add: user title, filebox...

[goodguy/history.git] / cinelerra-5.1 / cinelerra / edl.C

diff --git a/cinelerra-5.1/cinelerra/edl.C b/cinelerra-5.1/cinelerra/edl.C
index ccc5a1b9999e6ff90692a3847bd897a7c4cf8b18..cbde2640730df60673f6099fcd9e79f13050e544 100644 (file)
--- a/cinelerra-5.1/cinelerra/edl.C
+++ b/cinelerra-5.1/cinelerra/edl.C
@@ -1494,15 +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,
+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_use_scaler = use_scaler;
 
        if( use_scaler ) {
                for( int i=0; i<proxy_assets->size(); ++i ) {
@@ -1585,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;
+}
+