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

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

diff --git a/cinelerra-5.1/cinelerra/edl.h b/cinelerra-5.1/cinelerra/edl.h
index f5459de64e893ba8adb8a60185e3c9abbba899f7..606dcead99d9f05015d1426a44beb014bf9c367a 100644 (file)
--- a/cinelerra-5.1/cinelerra/edl.h
+++ b/cinelerra-5.1/cinelerra/edl.h
@@ -96,6 +96,8 @@ public:
        double frame_align(double position, int round);
 // frame align if cursor alignment is enabled
        double align_to_frame(double position, int round);
+// get position under cursor in pane
+       double get_cursor_position(int cursor_x, int pane_no);
 
 // increase track w/h to at least session w/h
        void retrack();
@@ -250,7 +252,7 @@ public:
 // Does nothing if EDL already exists
        void append_vwindow_edl(EDL *edl, int increase_counter);
        void rescale_proxy(int orig_scale, int new_scale);
-       void set_proxy(int use_scaler, int new_scale, int auto_scale,
+       void set_proxy(int new_scale, int use_scaler,
                ArrayList<Indexable*> *orig_assets, ArrayList<Indexable*> *proxy_assets);
        void add_proxy(int use_scaler,
                ArrayList<Indexable*> *orig_assets, ArrayList<Indexable*> *proxy_assets);