projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
re/open mixer window fixes
[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..13544431ea22b75a4010e846f690c74bae46f238 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);
@@
-272,7
+274,8
@@
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 mixer_track_active(Track *track);
void update_mixer_tracks();
void start_mixer();