add clip folders, icon margins, fix safe regions, update neophyte, fix folder edl...

[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 b974486145b5667148ee6521b37f69c6e09f47cc..9845ea6bf6f3b7bcd0942291d5c9540b7de27352 100644 (file)
--- 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
@@ -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);