rework proxy scaler, fix crop-gui coord, video_data tweak for proxy_format

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / mwindow.h

diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h
index 3256ace624402e1d4d964ae2fbbaefb6259568c2..6eb384cec586e71c38afed90a7e20c0767f1f515 100644 (file)
--- a/cinelerra-5.1/cinelerra/mwindow.h
+++ b/cinelerra-5.1/cinelerra/mwindow.h
@@ -88,7 +88,6 @@
 #include "thread.h"
 #include "threadloader.inc"
 #include "timebar.inc"
-#include "timebomb.h"
 #include "tipwindow.inc"
 #include "track.inc"
 #include "tracking.inc"
@@ -286,7 +285,7 @@ public:
        int zoom_in_t();
        void split_x();
        void split_y();
-       void crop_video();
+       void crop_video(int mode);
        void update_plugins();
 // Call after every edit operation
        void save_backup();
@@ -348,6 +347,9 @@ public:
        void clear(int clear_handle);
        void clear_labels();
        int clear_labels(double start, double end);
+       void clear_hard_edges();
+       int clear_hard_edges(double start, double end);
+       void clear_select();
        void concatenate_tracks();
        int copy_flags(int copy_flags=COPY_CLIPBOARD);
        void copy();
@@ -473,6 +475,7 @@ public:
        void set_automation_mode(int mode);
        void set_keyframe_type(int mode);
        void set_auto_keyframes(int value);
+       void set_span_keyframes(int value);
        void set_auto_visibility(Autos *autos, int value);
        void set_labels_follow_edits(int value);
 
@@ -519,9 +522,8 @@ public:
        int modify_pluginhandles();
        void finish_modify_handles();
        void rescale_proxy(EDL *clip, int orig_scale, int new_scale);
-       void add_proxy(int use_scaler,
-               ArrayList<Indexable*> *orig_assets,
-               ArrayList<Indexable*> *proxy_assets);
+       void add_proxy(ArrayList<Indexable*> *orig_assets,
+                       ArrayList<Indexable*> *proxy_assets);
        int render_proxy(ArrayList<Indexable *> &new_idxbls);
        void beep(double freq, double secs, double gain);
        int enable_proxy();
@@ -580,7 +582,6 @@ public:
        ArrayList<ColormodelItem*> colormodels;
        ArrayList<InterlacemodeItem*>          interlace_project_modes;
        ArrayList<InterlacemodeItem*>          interlace_asset_modes;
-       ArrayList<InterlacefixmethodItem*>     interlace_asset_fixmethods;
 
        int reset_meters();
        void resync_guis();