projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rework histogram_bezier, init wm icon set_icon(gg), update de.po+msg/txt
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
edlsession.h
diff --git
a/cinelerra-5.1/cinelerra/edlsession.h
b/cinelerra-5.1/cinelerra/edlsession.h
index 89748b6550fcfad693445a0326f1b4cf3ba0b120..44d09974c908be3e0277c5bc8e733444432192fe 100644
(file)
--- a/
cinelerra-5.1/cinelerra/edlsession.h
+++ b/
cinelerra-5.1/cinelerra/edlsession.h
@@
-116,6
+116,7
@@
public:
int cwindow_xscroll;
int cwindow_yscroll;
float cwindow_zoom;
int cwindow_xscroll;
int cwindow_yscroll;
float cwindow_zoom;
+ int cwindow_click2play;
// Transition
char default_atransition[BCTEXTLEN];
char default_vtransition[BCTEXTLEN];
// Transition
char default_atransition[BCTEXTLEN];
char default_vtransition[BCTEXTLEN];
@@
-160,10
+161,14
@@
public:
int playback_software_position;
// current settings are scaled this much from the original settings
int proxy_scale;
int playback_software_position;
// current settings are scaled this much from the original settings
int proxy_scale;
+// original proxy_scale when proxy_enable disables/enables proxy
+ int proxy_disabled_scale;
// upscale geom from proxy to session on read in
int proxy_use_scaler;
// automatically rescale assets when loaded
int proxy_auto_scale;
// upscale geom from proxy to session on read in
int proxy_use_scaler;
// automatically rescale assets when loaded
int proxy_auto_scale;
+// beep when proxy/render done
+ int proxy_beep, render_beep;
// int playback_strategy;
// Play audio in realtime priority
int real_time_playback;
// int playback_strategy;
// Play audio in realtime priority
int real_time_playback;
@@
-222,6
+227,7
@@
public:
// Use the vwindow meter or not
int vwindow_meter;
float vwindow_zoom;
// Use the vwindow meter or not
int vwindow_meter;
float vwindow_zoom;
+ int vwindow_click2play;
// Global ID counter
static int current_id;
// Global ID counter
static int current_id;