vicon checkout fix, checkout tweak, remove_all/delete_oldest rework, ffmpeg seek...

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / mwindow.h

diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h
index c94a7bd52dc77d08f7746fea59808ecf8d972989..c7076099ce7bae36dacaec3571a912eadf8a4447 100644 (file)
--- a/cinelerra-5.1/cinelerra/mwindow.h
+++ b/cinelerra-5.1/cinelerra/mwindow.h
@@ -112,8 +112,10 @@ class StackItem
 public:
        EDL *edl, *new_edl;
        Indexable *idxbl;
+       Edit *edit;
        MainUndo *undo;
        int64_t mtime;
+       double duration;
 };
 
 class Stack : public ArrayList<StackItem>
@@ -175,7 +177,7 @@ public:
 // Total horizontal pixels in timeline
        int get_tracks_width();
 // session stack
-       void stack_push(EDL *edl, Indexable *idxbl);
+       void stack_push(EDL *edl, Indexable *idxbl, Edit *edit=0);
        void stack_pop();
        int save(EDL *edl, char *filename, int stat);
        int save(int save_as);
@@ -272,7 +274,7 @@ public:
        void close_mixers(int result=1);
        void open_mixers();
        ZWindow *get_mixer(Mixer *&mixer);
-       void del_mixer(ZWindow *zwindow);
+       void close_mixer(ZWindow *zwindow);
        int mixer_track_active(Track *track);
        void update_mixer_tracks();
        void start_mixer();