projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
font/icon scaling default=1, remove glx probe msgs
[goodguy/history.git]
/
cinelerra-5.0
/
cinelerra
/
preferences.h
diff --git
a/cinelerra-5.0/cinelerra/preferences.h
b/cinelerra-5.0/cinelerra/preferences.h
index fbcc690584f99fad72bd726d04231cedb97e9fe5..c690a0b1c237cda0fd5f3acafbf051d280436e19 100644
(file)
--- a/
cinelerra-5.0/cinelerra/preferences.h
+++ b/
cinelerra-5.0/cinelerra/preferences.h
@@
-29,6
+29,7
@@
#include "maxchannels.h"
#include "mutex.inc"
#include "preferences.inc"
#include "maxchannels.h"
#include "mutex.inc"
#include "preferences.inc"
+#include "shbtnprefs.inc"
#include "videoconfig.inc"
#include "videoconfig.inc"
@@
-96,10
+97,10
@@
public:
int processors;
// Number of processors for interactive operations.
int real_processors;
int processors;
// Number of processors for interactive operations.
int real_processors;
-// enable/disable filefork
- int file_forking;
// ffmpeg probes early/late during File::open_file read
int ffmpeg_early_probe;
// ffmpeg probes early/late during File::open_file read
int ffmpeg_early_probe;
+// ffmpeg builds marker indecies as it builds idx files
+ int ffmpeg_marker_indecies;
int warn_indecies;
// Default positions for channels
int warn_indecies;
// Default positions for channels
@@
-139,6
+140,8
@@
public:
int android_remote;
int android_port;
char android_pin[BCSTRLEN];
int android_remote;
int android_port;
char android_pin[BCSTRLEN];
+// shell cmd line menu ops
+ ArrayList<ShBtnPref *> shbtn_prefs;
// ====================================== Plugin Set ==============================
char plugin_dir[BCTEXTLEN];
// ====================================== Plugin Set ==============================
char plugin_dir[BCTEXTLEN];