Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/makesdna/DNA_sequence_types.h')
-rw-r--r--source/blender/makesdna/DNA_sequence_types.h17
1 files changed, 11 insertions, 6 deletions
diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h
index a54fd838bbe..a46d737ba9d 100644
--- a/source/blender/makesdna/DNA_sequence_types.h
+++ b/source/blender/makesdna/DNA_sequence_types.h
@@ -151,21 +151,21 @@ typedef struct Sequence {
* Start frame of contents of strip in absolute frame coordinates.
* For metastrips start of first strip startdisp.
*/
- int start;
+ float start;
/**
* Frames after the first frame where display starts,
* frames before the last frame where display ends.
*/
- int startofs, endofs;
+ float startofs, endofs;
/**
* Frames that use the first frame before data begins,
* frames that use the last frame after data ends.
*/
- int startstill DNA_DEPRECATED, endstill DNA_DEPRECATED;
+ float startstill, endstill;
/** Machine: the strip channel */
int machine;
int _pad3;
- /** Starting and ending points of the strip in the sequence. */
+ /** Starting and ending points of the effect strip. Undefined for other strip types. */
int startdisp, enddisp;
float sat;
float mul;
@@ -213,7 +213,7 @@ typedef struct Sequence {
float volume;
/** Pitch (-0.1..10), pan -2..2. */
- float pitch, pan;
+ float pitch DNA_DEPRECATED, pan;
float strobe;
/** Struct pointer for effect settings. */
@@ -249,6 +249,11 @@ typedef struct Sequence {
/* modifiers */
ListBase modifiers;
+ /* Playback rate of strip content in frames per second. */
+ float media_playback_rate;
+ /* Multiply strip playback speed. */
+ float speed_factor;
+
SequenceRuntime runtime;
} Sequence;
@@ -563,7 +568,7 @@ enum {
SEQ_LOCK = (1 << 14),
SEQ_USE_PROXY = (1 << 15),
SEQ_IGNORE_CHANNEL_LOCK = (1 << 16),
- SEQ_FLAG_UNUSED_22 = (1 << 17), /* cleared */
+ SEQ_AUTO_PLAYBACK_RATE = (1 << 17),
SEQ_FLAG_UNUSED_18 = (1 << 18), /* cleared */
SEQ_FLAG_UNUSED_19 = (1 << 19), /* cleared */
SEQ_FLAG_UNUSED_21 = (1 << 21), /* cleared */