X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.h;h=9845ea6bf6f3b7bcd0942291d5c9540b7de27352;hb=5ac2037d8e5ab71a1915389cd08b458cfb60d64f;hp=fb3513a2b6cbf04f6ec4a4cdf8c9b4e3685fe247;hpb=976d56536456148f6d14a2c12630c20e367abbe1;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h
index fb3513a2..9845ea6b 100644
--- a/cinelerra-5.1/cinelerra/mwindow.h
+++ b/cinelerra-5.1/cinelerra/mwindow.h
@@ -352,8 +352,6 @@ public:
 // Calculate defaults path
 	static void create_defaults_path(char *string, const char *config_file);
 
-	void delete_folder(char *folder);
-
 	void delete_track();
 	void delete_track(Track *track);
 	void delete_tracks();
@@ -415,7 +413,8 @@ public:
 	void move_track_up(Track *track);
 	void move_tracks_up();
 	void mute_selection();
-	void new_folder(const char *new_folder);
+	void new_folder(const char *new_folder, int is_clips);
+	void delete_folder(char *folder);
 // For clipboard commands
 	void paste();
 // For splice and overwrite
@@ -509,14 +508,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, int new_use_scaler);
 	ProxyBeep *proxy_beep;
 
 	void dump_plugins(FILE *fp=stdout);
@@ -683,13 +682,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);