rework android-rmt display, add a few buttons

[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 e6bd368f7dafda06256a23f13f2462bcd4f8e224..97581ca8b6a5a03e741684fc1345823a5bfa4827 100644 (file)
--- 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"
@@ -411,6 +413,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
@@ -423,7 +426,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);
        
@@ -469,8 +475,6 @@ public:
        static void trap_hook(FILE *fp, void *vp);
        
        void reset_android_remote();
-       
-       
 
 // Send new EDL to caches
        void age_caches();
@@ -517,26 +521,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 +572,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 +605,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();