projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix auto id 'that' blunder, tweak keyfrm popup speed undo
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
zwindow.h
diff --git
a/cinelerra-5.1/cinelerra/zwindow.h
b/cinelerra-5.1/cinelerra/zwindow.h
index 3019d438c875b8f64687d9dfe91726c3e1e7c114..11b238ab80bca6278b83f51a1372dcc5114c12d6 100644
(file)
--- a/
cinelerra-5.1/cinelerra/zwindow.h
+++ b/
cinelerra-5.1/cinelerra/zwindow.h
@@
-28,18
+28,17
@@
#include "edl.inc"
#include "filexml.inc"
#include "mwindow.inc"
#include "edl.inc"
#include "filexml.inc"
#include "mwindow.inc"
-#include "playbackengine.inc"
#include "renderengine.inc"
#include "zwindowgui.inc"
class Mixer {
public:
#include "renderengine.inc"
#include "zwindowgui.inc"
class Mixer {
public:
- int idx;
+ int idx
, show
;
int x, y, w, h;
ArrayList<int> mixer_ids;
char title[BCSTRLEN];
int x, y, w, h;
ArrayList<int> mixer_ids;
char title[BCSTRLEN];
- Mixer(int idx);
+ Mixer(int idx
, int show
);
void save(FileXML *file);
int load(FileXML *file);
void copy_from(Mixer &that);
void save(FileXML *file);
int load(FileXML *file);
void copy_from(Mixer &that);
@@
-52,9
+51,9
@@
class Mixers : public ArrayList<Mixer *>
public:
Mixers();
~Mixers();
public:
Mixers();
~Mixers();
- Mixer *new_mixer();
+ Mixer *new_mixer(
int show=0
);
Mixer *get_mixer(int idx);
Mixer *get_mixer(int idx);
- void del_mixer(
int idx
);
+ void del_mixer(
Mixer *mixer
);
void save(FileXML *file);
int load(FileXML *file);
void copy_from(Mixers &that);
void save(FileXML *file);
int load(FileXML *file);
void copy_from(Mixers &that);
@@
-82,9
+81,10
@@
public:
ZWindowGUI *zgui;
EDL* edl;
ZWindowGUI *zgui;
EDL* edl;
- int idx
, destroy
;
- int highlighted;
+ int idx;
+ int highlighted
, playable
;
char title[BCTEXTLEN];
char title[BCTEXTLEN];
+ float zoom;
};
#endif
};
#endif