add proxy quick switch, folder lock, shortcuts update, bsd GL tweak

[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..bc22b29067182d4fdd0063acd4fdb4adaea46ea9 100644 (file)
--- a/cinelerra-5.1/cinelerra/edl.h
+++ b/cinelerra-5.1/cinelerra/edl.h
@@ -250,7 +250,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);