diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2009-08-10 01:16:39 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2009-08-10 01:16:39 +0400 |
| commit | 6c5c58e05799f2b593cd81fcff57e6ef72ad57fb (patch) | |
| tree | 8add929ef94d03fc69aecce6ef2baf283505782f /source/blender/makesdna/DNA_sequence_types.h | |
| parent | c1ca2ab5dceb8d5355215a3c7a80b171f394e487 (diff) | |
2.5: Sound branch merge!
See mailing list for additional information.
Diffstat (limited to 'source/blender/makesdna/DNA_sequence_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_sequence_types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index 422e1b07ed7..6d455d20f59 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -160,7 +160,7 @@ typedef struct Sequence { ListBase seqbase; /* list of strips for metastrips */ struct bSound *sound; /* the linked "bSound" object */ - struct hdaudio *hdaudio; /* external hdaudio object */ + struct SoundHandle *sound_handle; float level, pan; /* level in dB (0=full), pan -1..1 */ int scenenr; /* for scene selection */ float strobe; @@ -281,7 +281,7 @@ typedef struct SpeedControlVars { #define SEQ_MOVIE 3 #define SEQ_RAM_SOUND 4 #define SEQ_HD_SOUND 5 -#define SEQ_MOVIE_AND_HD_SOUND 6 /* helper for add_sequence */ +#define SEQ_SOUND 4 #define SEQ_EFFECT 8 #define SEQ_CROSS 8 |