projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add audio to proxy, and minor bug fixes
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
preferences.h
diff --git
a/cinelerra-5.1/cinelerra/preferences.h
b/cinelerra-5.1/cinelerra/preferences.h
index 55d47e890b176e264cb47e0a8cc9d7aba76b8500..d7f449efa09efcc0fe8f081471d3eab086512b56 100644
(file)
--- a/
cinelerra-5.1/cinelerra/preferences.h
+++ b/
cinelerra-5.1/cinelerra/preferences.h
@@
-129,7
+129,7
@@
public:
int yuv_color_range;
// Default positions for channels
int yuv_color_range;
// Default positions for channels
- int channel_positions[MAXCHANNELS
*
MAXCHANNELS];
+ int channel_positions[MAXCHANNELS
][
MAXCHANNELS];
Asset *brender_asset;
int use_brender;
Asset *brender_asset;
int use_brender;
@@
-156,6
+156,8
@@
public:
int renderfarm_job_count;
// Consolidate output files
int renderfarm_consolidate;
int renderfarm_job_count;
// Consolidate output files
int renderfarm_consolidate;
+// watchdog timeout, zero disabled
+ int renderfarm_watchdog_timeout;
// Tip of the day
int use_tipwindow;
// Tip of the day
int use_tipwindow;