fixes for vicons checkin

[goodguy/history.git] / cinelerra-5.0 / cinelerra / mwindow.h

diff --git a/cinelerra-5.0/cinelerra/mwindow.h b/cinelerra-5.0/cinelerra/mwindow.h
index 79ef49da3f3cfec8562042adc65a09809cdc93ad..7d7d2ce5ac1922cb01f01896e83a8a0375dd0512 100644 (file)
--- 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"
@@ -67,6 +66,7 @@
 #include "playback3d.inc"
 #include "playbackengine.inc"
 #include "plugin.inc"
+#include "pluginfclient.inc"
 #include "pluginserver.inc"
 #include "pluginset.inc"
 #include "preferences.inc"
@@ -519,20 +519,18 @@ 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, 
@@ -572,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();
@@ -606,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();