X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fmwindow.h;h=d01f9ddb1299ec93dda1c127704148b9a6242e3c;hb=9ffdfbe8e6fa7daaad4dcfdd46b6ac7b6e7a47e8;hp=c94a7bd52dc77d08f7746fea59808ecf8d972989;hpb=3643286e2dbb3002604a62e3e6fd834716b4ae63;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/mwindow.h b/cinelerra-5.1/cinelerra/mwindow.h index c94a7bd5..d01f9ddb 100644 --- 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 @@ -144,6 +146,17 @@ public: }; +class DrawTrackMovement : public Thread +{ +public: + DrawTrackMovement(MWindow *mwindow); + ~DrawTrackMovement(); + void run(); + + MWindow *mwindow; +}; + + class MWindow : public Thread { public: @@ -175,7 +188,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,12 +285,14 @@ public: void close_mixers(int result=1); void open_mixers(); ZWindow *get_mixer(Mixer *&mixer); - void del_mixer(ZWindow *zwindow); + ZWindow *get_mixer(int idx); + void close_mixer(ZWindow *zwindow); int mixer_track_active(Track *track); void update_mixer_tracks(); void start_mixer(); int select_zwindow(ZWindow *zwindow); void tile_mixers(); + void set_gang_tracks(int v); int load_filenames(ArrayList *filenames, int load_mode = LOADMODE_REPLACE, int edl_mode = LOADMODE_EDL_CLIP, @@ -291,6 +306,8 @@ public: int interrupt_indexes(); // Stop index building int redraw_time_dependancies(); // after reconfiguring the time format, sample rate, frame rate + void draw_trackmovement(); // after reconfiguring tracks/patchbay guis + DrawTrackMovement *redraw_tracks; // =========================================== movement @@ -442,7 +459,7 @@ public: // TrackCanvas calls this to insert multiple effects from the drag_pluginservers // into pluginset_highlighted. - void insert_effects_canvas(double start, double length); + void insert_effects_canvas(Track *dest_track, double start, double length); // CWindow calls this to insert multiple effects from // the drag_pluginservers array.