projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
upgrade to ffmpeg-2.8
[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 0009c181f62083c6e6773cfabf6f541f8fe78c1a..30ff9242dbe8bb092f6906d49337dde22cbbb848 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"
@@
-100,6
+101,7
@@
public:
int file_forking;
// ffmpeg probes early/late during File::open_file read
int ffmpeg_early_probe;
int file_forking;
// ffmpeg probes early/late during File::open_file read
int ffmpeg_early_probe;
+ int warn_indecies;
// Default positions for channels
int channel_positions[MAXCHANNELS * MAXCHANNELS];
// Default positions for channels
int channel_positions[MAXCHANNELS * MAXCHANNELS];
@@
-138,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];