From 9827a3e9eac70f68db6dc16d03016c51b7ece3f0 Mon Sep 17 00:00:00 2001 From: Joerg Mueller Date: Sun, 7 Feb 2010 23:41:17 +0000 Subject: 2.5 Audio: - recode of the whole sequencer audio handling - encode audio flag removed, instead you choose None as audio codec, added None for video codec too - ffmpeg formats/codecs: enabled: theora, ogg, vorbis; added: matroska, flac (not working, who can fix?), mp3, wav - sequencer wave drawing - volume animation (now also working when mixing down to a file!) - made sequencer strip position and length values unanimatable --- source/blender/makesdna/DNA_sound_types.h | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) (limited to 'source/blender/makesdna/DNA_sound_types.h') diff --git a/source/blender/makesdna/DNA_sound_types.h b/source/blender/makesdna/DNA_sound_types.h index 55b48e4aacd..c0b8657618d 100644 --- a/source/blender/makesdna/DNA_sound_types.h +++ b/source/blender/makesdna/DNA_sound_types.h @@ -41,21 +41,6 @@ struct Ipo; struct PackedFile; struct SpaceLink; -// runtime only - no saving -typedef struct SoundHandle { - struct SoundHandle *next, *prev; - struct bSound *source; - void *handle; - int state; - int startframe; - int endframe; - int frameskip; - int mute; - int changed; - float volume; - float pad; -} SoundHandle; - typedef struct Sound3D { float min_gain; @@ -98,19 +83,21 @@ typedef struct bSound { float max_gain; float distance; int flags; + int pad; /** currently int type; struct bSound *child_sound;*/ /** - * Whether the sound has been changed and must be restarted if playing. + * The audaspace handle for cache. */ - int changed; + void *cache; /** - * The audaspace handle for cache. + * The audaspace handle that should actually be played back. + * Should be cache if cache != NULL; otherwise it's handle */ - void *cache; + void *playback_handle; /** XXX unused currently // SOUND_TYPE_LIMITER float start, end;*/ -- cgit v1.2.3