X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.0%2Fcinelerra%2Fmwindow.h;h=97581ca8b6a5a03e741684fc1345823a5bfa4827;hb=c0b71a7151437c681fe832d1e446924a49ab29aa;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..97581ca8 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" @@ -414,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 @@ -426,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 *drag_assets /* mwindow->session->drag_assets */, + ArrayList *drag_clips /* mwindow->session->drag_clips */); void remove_assets_from_disk(); void resize_track(Track *track, int w, int h); @@ -472,8 +475,6 @@ public: static void trap_hook(FILE *fp, void *vp); void reset_android_remote(); - - // Send new EDL to caches void age_caches(); @@ -520,8 +521,6 @@ public: ChannelDB *channeldb_buz; ChannelDB *channeldb_v4l2jpeg; - static FileServer *file_server; - // ====================================== plugins ============================== // Contains file descriptors for all the dlopens @@ -573,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();