projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Credit Andrew - add Details of color transfers/primaries, + update x264 from r3106...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
edl.inc
diff --git
a/cinelerra-5.1/cinelerra/edl.inc
b/cinelerra-5.1/cinelerra/edl.inc
index 2d7256885bf6219eecdbc806759ebf777e293ca3..8b9e73037e34d85cd2eb9426aa44c9b67038f6fd 100644
(file)
--- a/
cinelerra-5.1/cinelerra/edl.inc
+++ b/
cinelerra-5.1/cinelerra/edl.inc
@@
-2,6
+2,7
@@
/*
* CINELERRA
* Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
/*
* CINELERRA
* Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
+ * Copyright (C) 2003-2016 Cinelerra CV contributors
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-125,6
+126,8
@@
class EDL;
#define ASSETS_ICON_LIST 3
#define FOLDERS_TEXT 0
#define FOLDERS_ICONS 1
#define ASSETS_ICON_LIST 3
#define FOLDERS_TEXT 0
#define FOLDERS_ICONS 1
+#define ASSET_MAX_WIDTH 32767
+#define ASSET_MAX_HEIGHT 32767
#define ASSET_COLUMNS 2
#define ASSET_COLUMNS 2
@@
-158,10
+161,11
@@
class EDL;
#define MIN_ZOOM_TIME 1
#define MAX_ZOOM_TIME 0x100000
#define DEFAULT_ZOOM_TIME 1024
#define MIN_ZOOM_TIME 1
#define MAX_ZOOM_TIME 0x100000
#define DEFAULT_ZOOM_TIME 1024
+#define DEFAULT_ZOOM_TRACK 64
#define MIN_AMP_ZOOM 8
#define MIN_AMP_ZOOM 8
-#define MAX_AMP_ZOOM
262144
-#define MIN_TRACK_ZOOM
32
-#define MAX_TRACK_ZOOM
1024
+#define MAX_AMP_ZOOM
8192
+#define MIN_TRACK_ZOOM
8
+#define MAX_TRACK_ZOOM
8192
#define MAX_PAN 1.0
#define PAN_RADIUS 50
#define MAX_PAN 1.0
#define PAN_RADIUS 50
@@
-179,4
+183,8
@@
class EDL;
#define INSERT_EFFECTS_EXTRA 5
#define INSERT_EFFECTS_MASTER 6
#define INSERT_EFFECTS_EXTRA 5
#define INSERT_EFFECTS_MASTER 6
+#define PROXY_INACTIVE 0
+#define PROXY_ACTIVE 1
+#define PROXY_DISABLED 2
+
#endif
#endif