X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.0%2Fcinelerra%2Fmwindow.h;h=006b68fb81f99adc1379ede32c7255a67d1e3be1;hb=748ee792315fb16950b10d231acaa4757fe58084;hp=88613de83a1298c137f3ff8563d371638e2cfcd1;hpb=a3a59f63fdfbcf94c561595f515951fdfd4bea30;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.0/cinelerra/mwindow.h b/cinelerra-5.0/cinelerra/mwindow.h
index 88613de8..006b68fb 100644
--- a/cinelerra-5.0/cinelerra/mwindow.h
+++ b/cinelerra-5.0/cinelerra/mwindow.h
@@ -44,7 +44,6 @@
 #include "dvdcreate.inc"
 #include "edit.inc"
 #include "edl.inc"
-#include "fileserver.inc"
 #include "filesystem.inc"
 #include "filexml.inc"
 #include "framecache.inc"
@@ -189,6 +188,7 @@ public:
 // Find the plugin whose title matches title and return it
 	static PluginServer* scan_plugindb(char *title,
 		int data_type);
+	static int plugin_exists(const char *plugin_path, ArrayList<PluginServer*> &plugins);
 	static int plugin_exists(char *plugin_path);
 	void dump_plugindb(FILE *fp);
 	void stop_playback(int wait=0);
@@ -414,6 +414,7 @@ public:
 	void paste_audio_transition();
 	void paste_video_transition();
 	void shuffle_edits();
+	void reverse_edits();
 	void align_edits();
 	void set_edit_length(double length);
 // Set length of single transition
@@ -426,7 +427,10 @@ public:
 // Asset removal from caches
 	void reset_caches();
 	void remove_asset_from_caches(Asset *asset);
-	void remove_assets_from_project(int push_undo = 0);
+	void remove_assets_from_project(int push_undo /* = 0 */, 
+		int redraw /* 1 */,
+		ArrayList<Indexable*> *drag_assets /* mwindow->session->drag_assets */,
+		ArrayList<EDL*> *drag_clips /* mwindow->session->drag_clips */);
 	void remove_assets_from_disk();
 	void resize_track(Track *track, int w, int h);
 	
@@ -472,8 +476,6 @@ public:
 	static void trap_hook(FILE *fp, void *vp);
 	
 	void reset_android_remote();
-	
-	
 
 // Send new EDL to caches
 	void age_caches();
@@ -520,8 +522,6 @@ public:
 	ChannelDB *channeldb_buz;
 	ChannelDB *channeldb_v4l2jpeg;
 
-	static FileServer *file_server;
-
 // ====================================== plugins ==============================
 
 // Contains file descriptors for all the dlopens
@@ -573,7 +573,6 @@ public:
 
 // Initialize shared memory
 	void init_shm();
-	static void init_fileserver(Preferences *preferences);
 
 // Initialize channel DB's for playback
 	void init_channeldb();
@@ -604,12 +603,21 @@ public:
 	void init_gwindow();
 	void init_tipwindow();
 // Used by MWindow and RenderFarmClient
+	static void get_plugin_path(char *path, const char *plug_dir, const char *fs_path);
 	static int init_plugins(MWindow *mwindow, Preferences *preferences);
+	static int init_ladspa_plugins(MWindow *mwindow, Preferences *preferences);
+	static int check_plugin_index(ArrayList<PluginServer*> &plugins,
+		const char *plug_dir, const char *plug_path);
 	static void init_plugin_index(MWindow *mwindow, Preferences *preferences,
-		FILE *fp, const char *plug_dir, const char *plug_path, int &dir_id);
+		FILE *fp, const char *plugin_dir);
+	static int init_ladspa_index(MWindow *mwindow, Preferences *preferences,
+		const char *index_path, 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, char *path);
+	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);
 	void init_preferences();
 	void init_signals();
@@ -625,7 +633,8 @@ public:
 	void init_3d();
 	void init_playbackcursor();
 	void init_commercials();
-	void delete_plugins();
+	static void add_plugins(ArrayList<PluginServer*> &plugins);
+	static void delete_plugins();
 // 
 	void clean_indexes();
 //	TimeBomb timebomb;