X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.0%2Fcinelerra%2Fmwindow.h;h=7d7d2ce5ac1922cb01f01896e83a8a0375dd0512;hb=6c0c8bd0e577001d1cc18c6c27d58e62f58a6bff;hp=e6bd368f7dafda06256a23f13f2462bcd4f8e224;hpb=8bbd1679c5811ba26608d5fc9ed60cedeb2bc103;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.0/cinelerra/mwindow.h b/cinelerra-5.0/cinelerra/mwindow.h
index e6bd368f..7d7d2ce5 100644
--- a/cinelerra-5.0/cinelerra/mwindow.h
+++ b/cinelerra-5.0/cinelerra/mwindow.h
@@ -31,6 +31,7 @@
 #include "awindow.inc"
 #include "batchrender.inc"
 #include "bcwindowbase.inc"
+#include "bdcreate.inc"
 #include "brender.inc"
 #include "cache.inc"
 #include "channel.inc"
@@ -40,9 +41,9 @@
 #include "bchash.inc"
 #include "devicedvbinput.inc"
 #include "devicempeginput.inc"
+#include "dvdcreate.inc"
 #include "edit.inc"
 #include "edl.inc"
-#include "fileserver.inc"
 #include "filesystem.inc"
 #include "filexml.inc"
 #include "framecache.inc"
@@ -65,6 +66,7 @@
 #include "playback3d.inc"
 #include "playbackengine.inc"
 #include "plugin.inc"
+#include "pluginfclient.inc"
 #include "pluginserver.inc"
 #include "pluginset.inc"
 #include "preferences.inc"
@@ -517,26 +519,25 @@ public:
 	ChannelDB *channeldb_buz;
 	ChannelDB *channeldb_v4l2jpeg;
 
-	static FileServer *file_server;
-
 // ====================================== plugins ==============================
 
 // Contains file descriptors for all the dlopens
 	static ArrayList<PluginServer*> *plugindb;
 // Currently visible plugins
+	int64_t plugin_visibility;
 	ArrayList<PluginServer*> *plugin_guis;
 // GUI Plugins to delete
 	ArrayList<PluginServer*> *dead_plugins;
 // Keyframe editors
 	ArrayList<KeyFrameThread*> *keyframe_threads;
 
-
 // Adjust sample position to line up with frames.
 	int fix_timing(int64_t &samples_out, 
 		int64_t &frames_out, 
 		int64_t samples_in);
 
 
+	CreateBD_Thread *create_bd;
 	CreateDVD_Thread *create_dvd;
 	BatchRenderThread *batch_render;
 	Render *render;
@@ -569,7 +570,6 @@ public:
 
 // Initialize shared memory
 	void init_shm();
-	static void init_fileserver(Preferences *preferences);
 
 // Initialize channel DB's for playback
 	void init_channeldb();
@@ -603,7 +603,10 @@ public:
 	static int init_plugins(MWindow *mwindow, Preferences *preferences);
 	static void init_plugin_index(MWindow *mwindow, Preferences *preferences,
 		FILE *fp, const char *plug_dir, const char *plug_path, int &dir_id);
+	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 PluginServer* new_ffmpeg_server(MWindow *mwindow, const char *name);
 	void init_preferences();
 	void init_signals();
 	void init_theme();