lock xft, plugin index builder lock, clear clip thumbnails, clear vwin clock, setpoin...

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

diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h
index fb3513a2b6cbf04f6ec4a4cdf8c9b4e3685fe247..2ec3068359830bff038cce0efe932f07e647bc25 100644 (file)
--- a/cinelerra-5.1/cinelerra/mwindow.h
+++ b/cinelerra-5.1/cinelerra/mwindow.h
@@ -509,14 +509,14 @@ public:
        int modify_pluginhandles();
        void finish_modify_handles();
        void rescale_proxy(EDL *clip, int orig_scale, int new_scale);
-       void set_proxy(int use_scaler, int new_scale, int auto_scale, int beep,
-               ArrayList<Indexable*> *orig_assets,
-               ArrayList<Indexable*> *proxy_assets);
        void add_proxy(int use_scaler,
                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();
+       int disable_proxy();
+       int to_proxy(Asset *asset, int new_scale);
        ProxyBeep *proxy_beep;
 
        void dump_plugins(FILE *fp=stdout);
@@ -683,13 +683,12 @@ public:
        static void init_plugin_index(MWindow *mwindow, Preferences *preferences,
                FILE *fp, const char *plugin_dir);
        static int init_ladspa_index(MWindow *mwindow, Preferences *preferences,
-               const char *index_path, const char *plugin_dir);
+               FILE *fp, const char *plugin_dir);
        static void scan_plugin_index(MWindow *mwindow, Preferences *preferences,
                FILE *fp, const char *plug_dir, const char *plug_path, int &idx);
        static void init_ffmpeg();
        static void init_ffmpeg_index(MWindow *mwindow, Preferences *preferences, FILE *fp);
-       static int load_plugin_index(MWindow *mwindow, const char *index_path,
-               const char *plugin_dir);
+       static int load_plugin_index(MWindow *mwindow, FILE *fp, const char *plugin_dir);
        static PluginServer *new_ffmpeg_server(MWindow *mwindow, const char *name);
        static int init_lv2_index(MWindow *mwindow, Preferences *preferences, FILE *fp);
        static PluginServer *new_lv2_server(MWindow *mwindow, const char *name);