X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.h;h=9845ea6bf6f3b7bcd0942291d5c9540b7de27352;hb=8bd72f90925843be9ab9182c89761ee0640e7873;hp=252f96dbf99e5a741dfff8062063b14cd82ca06b;hpb=214bd0ba9e21635e03d0c0e2b2ae1a7e9170583c;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h
index 252f96db..9845ea6b 100644
--- a/cinelerra-5.1/cinelerra/mwindow.h
+++ b/cinelerra-5.1/cinelerra/mwindow.h
@@ -75,6 +75,7 @@
 #include "pluginset.inc"
 #include "preferences.inc"
 #include "preferencesthread.inc"
+#include "proxy.inc"
 #include "record.inc"
 #include "recordlabel.inc"
 #include "render.inc"
@@ -208,7 +209,7 @@ public:
 	void create_mixers();
 	void refresh_mixers(int dir=1);
 	void stop_mixers();
-	void close_mixers();
+	void close_mixers(int destroy=1);
 	void open_mixers();
 	ZWindow *get_mixer(Mixer *&mixer);
 	void del_mixer(ZWindow *zwindow);
@@ -351,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();
@@ -414,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
@@ -507,13 +507,16 @@ public:
 	int modify_edithandles();
 	int modify_pluginhandles();
 	void finish_modify_handles();
-	void set_proxy(int use_scaler, int new_scale, int auto_scale,
-		ArrayList<Indexable*> *orig_assets,
-		ArrayList<Indexable*> *proxy_assets);
+	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 render_proxy(ArrayList<Indexable *> &new_idxbls);
+	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);
 	void dump_edl(FILE *fp=stdout);
@@ -557,6 +560,8 @@ public:
 	static Commercials *commercials;
 	int commercial_active;
 	int has_commercials();
+// copy of edl created in speed_before, used in speed_after to normalize_speed
+	EDL *speed_edl;
 
 // Menu items
 	ArrayList<ColormodelItem*> colormodels;
@@ -631,10 +636,8 @@ public:
 	Mutex *keyframe_gui_lock;
 // Lock during creation and destruction of brender so playback doesn't use it.
 	Mutex *brender_lock;
-
 // Initialize shared memory
-	void init_shm();
-
+	void init_shm(const char *pfn, int64_t min);
 // Initialize channel DB's for playback
 	void init_channeldb();
 	void init_render();
@@ -655,6 +658,7 @@ public:
 	void commit_commercial();
 	void undo_commercial();
 	void cut_commercials();
+	void update_gui(int changed_edl);
 	int paste_subtitle_text(char *text, double start, double end);
 
 	void init_error();
@@ -678,14 +682,17 @@ 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 PluginServer* new_ffmpeg_server(MWindow *mwindow, const char *name);
+	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);
+	static void remove_plugin_index();
+
 	void init_preferences();
 	void init_signals();
 	void init_theme();
@@ -702,6 +709,9 @@ public:
 	void init_commercials();
 	static void add_plugins(ArrayList<PluginServer*> &plugins);
 	static void delete_plugins();
+	void speed_before();
+	int speed_after(int done);
+	int normalize_speed(EDL *old_edl, EDL *new_edl);
 //
 	void clean_indexes();
 //	TimeBomb timebomb;