projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refresh frame fix, dblclk proxy viewer fix, vicon refresh fix for awdw resize, fix...
[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 a9679e8fcb8a916be7340f6a2adc2daa4f470ba9..44d09974c908be3e0277c5bc8e733444432192fe 100644
(file)
--- a/
cinelerra-5.1/cinelerra/edlsession.h
+++ b/
cinelerra-5.1/cinelerra/edlsession.h
@@
-161,12
+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;
+// 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;