projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improve delays created by vicon drawing locks, reset_cache segv fix, gang track toolt...
[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..d01f9ddb1299ec93dda1c127704148b9a6242e3c 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>
@@
-144,6
+146,17
@@
public:
};
};
+class DrawTrackMovement : public Thread
+{
+public:
+ DrawTrackMovement(MWindow *mwindow);
+ ~DrawTrackMovement();
+ void run();
+
+ MWindow *mwindow;
+};
+
+
class MWindow : public Thread
{
public:
class MWindow : public Thread
{
public:
@@
-175,7
+188,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);
@@
-272,12
+285,14
@@
public:
void close_mixers(int result=1);
void open_mixers();
ZWindow *get_mixer(Mixer *&mixer);
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();
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<char*> *filenames,
int load_mode = LOADMODE_REPLACE,
int edl_mode = LOADMODE_EDL_CLIP,
int load_filenames(ArrayList<char*> *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
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
// =========================================== movement
@@
-442,7
+459,7
@@
public:
// TrackCanvas calls this to insert multiple effects from the drag_pluginservers
// into pluginset_highlighted.
// 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.
// CWindow calls this to insert multiple effects from
// the drag_pluginservers array.