diff options
Diffstat (limited to 'source/blender/makesdna/DNA_sequence_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_sequence_types.h | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index aeae840707d..ba64f332de5 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -40,6 +40,7 @@ struct Ipo; struct Scene; struct bSound; +struct MovieClip; /* strlens; 256= FILE_MAXFILE, 768= FILE_MAXDIR */ @@ -88,9 +89,11 @@ typedef struct StripProxy { typedef struct Strip { struct Strip *next, *prev; - int rt, len, us, done; + int us, done; int startstill, endstill; - StripElem *stripdata; + StripElem *stripdata; /* only used as an array in IMAGE sequences(!), + and as a 1-element array in MOVIE sequences, + NULL for all other strip-types */ char dir[768]; StripProxy *proxy; StripCrop *crop; @@ -137,10 +140,11 @@ typedef struct Sequence { int startdisp, enddisp; /*starting and ending points in the sequence*/ float sat; float mul, handsize; - /* is sfra needed anymore? - it looks like its only used in one place */ - int sfra; /* starting frame according to the timeline of the scene. */ - int anim_preseek; - int streamindex; /* streamindex for movie or sound files with several streams */ + + short anim_preseek; + short streamindex; /* streamindex for movie or sound files with several streams */ + int multicam_source; /* for multicam source selection */ + int clip_flag; /* MOVIECLIP render flags */ Strip *strip; @@ -148,7 +152,9 @@ typedef struct Sequence { struct Scene *scene; struct Object *scene_camera; /* override scene camera */ - struct anim *anim; + struct anim *anim; /* for MOVIE strips */ + struct MovieClip *clip; /* for MOVIECLIP strips */ + float effect_fader; float speed_fader; @@ -164,8 +170,6 @@ typedef struct Sequence { float volume; float pitch, pan; /* pitch (-0.1..10), pan -2..2 */ - int scenenr; /* for scene selection */ - int multicam_source; /* for multicam source selection */ float strobe; void *effectdata; /* Struct pointer for effect settings */ @@ -173,6 +177,7 @@ typedef struct Sequence { int anim_startofs; /* only use part of animation file */ int anim_endofs; /* is subtle different to startofs / endofs */ + int blend_mode; float blend_opacity; @@ -321,6 +326,7 @@ typedef struct SpeedControlVars { #define SEQ_RAM_SOUND 4 #define SEQ_HD_SOUND 5 #define SEQ_SOUND 4 +#define SEQ_MOVIECLIP 6 #define SEQ_EFFECT 8 #define SEQ_CROSS 8 @@ -346,6 +352,9 @@ typedef struct SpeedControlVars { #define STRIPELEM_PREVIEW_DONE 1 +#define SEQ_MOVIECLIP_RENDER_UNDISTORTED (1<<0) +#define SEQ_MOVIECLIP_RENDER_STABILIZED (1<<1) + #define SEQ_BLEND_REPLACE 0 /* all other BLEND_MODEs are simple SEQ_EFFECT ids and therefore identical * to the table above. (Only those effects that handle _exactly_ two inputs, |