projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Andrew fixed Attach Transitions and added english tips
[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 1c6f4ce077b65be5a4720ba96ab78288986028ba..11b238ab80bca6278b83f51a1372dcc5114c12d6 100644
(file)
--- a/
cinelerra-5.1/cinelerra/zwindow.h
+++ b/
cinelerra-5.1/cinelerra/zwindow.h
@@
-33,12
+33,12
@@
class Mixer {
public:
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);
@@
-51,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,8
+82,9
@@
public:
EDL* edl;
int idx;
EDL* edl;
int idx;
- int highlighted;
+ int highlighted
, playable
;
char title[BCTEXTLEN];
char title[BCTEXTLEN];
+ float zoom;
};
#endif
};
#endif