projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update libaom via Andrew + 0006 patch LIBZMPEG
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
localsession.h
diff --git
a/cinelerra-5.1/cinelerra/localsession.h
b/cinelerra-5.1/cinelerra/localsession.h
index d43b6353f0f90f3b31dd969df0c0c49c1709fd08..3497d07e4bf20a0313732a1f739042da8e07041a 100644
(file)
--- a/
cinelerra-5.1/cinelerra/localsession.h
+++ b/
cinelerra-5.1/cinelerra/localsession.h
@@
-67,6
+67,7
@@
public:
void synchronize_params(LocalSession *that);
void boundaries();
void synchronize_params(LocalSession *that);
void boundaries();
+ void reset_view_limits();
EDL *edl;
EDL *edl;
@@
-74,6
+75,8
@@
public:
// Number of samples if pasted from a clipboard.
// If 0 use longest track
double clipboard_length;
// Number of samples if pasted from a clipboard.
// If 0 use longest track
double clipboard_length;
+// edl created by asset_to_edl
+ int asset2edl;
// Title if clip
char clip_title[BCTEXTLEN];
char clip_notes[BCTEXTLEN];
// Title if clip
char clip_title[BCTEXTLEN];
char clip_notes[BCTEXTLEN];
@@
-97,7
+100,8
@@
public:
// Amplitude zoom
int64_t zoom_y;
// Track zoom
// Amplitude zoom
int64_t zoom_y;
// Track zoom
- int64_t zoom_track;
+ int64_t zoom_atrack;
+ int64_t zoom_vtrack;
// Vertical automation scale
float automation_mins[AUTOGROUPTYPE_COUNT];
// Vertical automation scale
float automation_mins[AUTOGROUPTYPE_COUNT];
@@
-110,6
+114,10
@@
public:
float red, green, blue;
float red_max, green_max, blue_max;
int use_max;
float red, green, blue;
float red_max, green_max, blue_max;
int use_max;
+// mask solo track, or -1
+ int solo_track_id;
+// gang mode: none, channels, media
+ int gang_tracks;
private:
// The reason why selection ranges and inpoints have to be separate:
// The selection position has to change to set new in points.
private:
// The reason why selection ranges and inpoints have to be separate:
// The selection position has to change to set new in points.