fix awdw solo vicon crash, fix nested clip for binfolders, open edit edl

[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 74717d8ce6b4cd033af299c60d91c106d973879b..59f816c658ccfd5f2c4917ac590aca75cd54d7cb 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;
 public:
        EDL *edl, *new_edl;
        Indexable *idxbl;

+       Edit *edit;

        MainUndo *undo;
        int64_t mtime;
        MainUndo *undo;
        int64_t mtime;

+       double duration;

 };
 
 class Stack : public ArrayList<StackItem>
 };
 
 class Stack : public ArrayList<StackItem>


@@ -175,7 +177,7 @@ public:
 // Total horizontal pixels in timeline
        int get_tracks_width();
 // session stack
 // 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);
        void stack_pop();
        int save(EDL *edl, char *filename, int stat);
        int save(int save_as);


@@ -303,7 +305,8 @@ public:
        int zoom_sample(int64_t zoom_sample);
        void zoom_autos(float min, float max);
        void zoom_amp(int64_t zoom_amp);
        int zoom_sample(int64_t zoom_sample);
        void zoom_autos(float min, float max);
        void zoom_amp(int64_t zoom_amp);

-       void zoom_track(int64_t zoom_track);
+       void zoom_atrack(int64_t zoom);
+       void zoom_vtrack(int64_t zoom);

        int fit_sample();
        int move_left(int64_t distance = 0);
        int move_right(int64_t distance = 0);
        int fit_sample();
        int move_left(int64_t distance = 0);
        int move_right(int64_t distance = 0);


@@ -597,6 +600,7 @@ public:
        void dump_edl(FILE *fp=stdout);
        void dump_undo(FILE *fp=stdout);
        void dump_exe(FILE *fp=stdout);
        void dump_edl(FILE *fp=stdout);
        void dump_undo(FILE *fp=stdout);
        void dump_exe(FILE *fp=stdout);

+       void dump_caches(FILE *fp=stdout);

        static void trap_hook(FILE *fp, void *vp);
 
        void reset_android_remote();
        static void trap_hook(FILE *fp, void *vp);
 
        void reset_android_remote();