diff options
| author | Peter Schlaile <peter@schlaile.de> | 2009-06-11 15:44:47 +0400 |
|---|---|---|
| committer | Peter Schlaile <peter@schlaile.de> | 2009-06-11 15:44:47 +0400 |
| commit | bf729ab26879cd290696f5950a09c423bafdebc0 (patch) | |
| tree | 1710081f5724a32ec085ecebb0f00231c6a08808 /source/blender/makesdna | |
| parent | 8225caa9fbd32021c15edc108b6093c3bf1e1c9b (diff) | |
== SEQUENCER ==
This fixes
* some issues with Scene strips containing audio by removing
the curpos pointer from sequence structure. (the same scene
strip can now be used in a row)
That also makes the code a lot cleaner.
* fixed a corner case on the beginning of a strip, where audio was
not mixed in, depending of current audio buffer state.
* Also: made some hardwired variables macros to enhance readability.
Problem remaining: mixing the same scene strip several times (read
put it into a stack instead of into a row) has
problems with HD-audio since the same HD-audio state structure is
used and therefore the system will seek permanently, which leads to
audio distortions...
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_sequence_types.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index 801b283a6c2..ed1626c887f 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -159,7 +159,7 @@ typedef struct Sequence { struct bSound *sound; /* the linked "bSound" object */ struct hdaudio *hdaudio; /* external hdaudio object */ float level, pan; /* level in dB (0=full), pan -1..1 */ - int curpos; /* last sample position in audio_fill() */ + int scenenr; /* for scene selection */ float strobe; void *effectdata; /* Struct pointer for effect settings */ @@ -170,8 +170,6 @@ typedef struct Sequence { int blend_mode; float blend_opacity; - int scenenr; /* for scene selection */ - int pad; } Sequence; typedef struct MetaStack { |