X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.h;h=bbf89b975b9b7c5620973f95064ced7d936bcd68;hb=a401d3a0c7e80c973bdb3b0d807f2e93cdae8036;hp=b974486145b5667148ee6521b37f69c6e09f47cc;hpb=540f653df26e5e2d1249de1f7a1a3d888dddf341;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h
index b9744861..bbf89b97 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();
@@ -416,6 +414,7 @@ public:
 	void move_tracks_up();
 	void mute_selection();
 	void new_folder(const char *new_folder);
+	void delete_folder(char *folder);
 // For clipboard commands
 	void paste();
 // For splice and overwrite
@@ -516,7 +515,7 @@ public:
 	void beep(double freq, double secs, double gain);
 	int enable_proxy();
 	int disable_proxy();
-	int to_proxy(Asset *asset, int new_scale);
+	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);