2.5: Sound branch merge!

See mailing list for additional information.

5 files changed, 74 insertions, 19 deletions

diff --git a/source/blender/makesdna/DNA_actuator_types.h b/source/blender/makesdna/DNA_actuator_types.h
index c3f668ff622..bbfd9cadf67 100644
--- a/source/blender/makesdna/DNA_actuator_types.h
+++ b/source/blender/makesdna/DNA_actuator_types.h
@@ -37,6 +37,9 @@ struct Scene;
 struct Group;
 struct Text;
 
+// for Sound3D
+#include "DNA_sound_types.h"
+
 /* ****************** ACTUATORS ********************* */
 
 /* unused now, moved to editobjectactuator in 2.02. Still needed for dna */
@@ -62,7 +65,9 @@ typedef struct bSoundActuator {
 	short flag, sndnr;
 	int sta, end;
 	short pad1[2];
+	float volume, pitch;
 	struct bSound *sound;
+	struct Sound3D sound3D;
 	short type, makecopy;
 	short copymade, pad2[1];
 } bSoundActuator;
@@ -432,6 +437,9 @@ typedef struct FreeCamera {
 #define ACT_RANDOM_FLOAT_NORMAL                8
 #define ACT_RANDOM_FLOAT_NEGATIVE_EXPONENTIAL  9
 
+/* SoundActuator->flag */
+#define ACT_SND_3D_SOUND		1
+
 /*  SoundActuator->type */
 #define ACT_SND_PLAY_STOP_SOUND		0
 #define ACT_SND_PLAY_END_SOUND		1
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 752f756401c..36cd0c6ffdf 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -662,6 +662,7 @@ typedef struct Scene {
 	ListBase markers;
 	ListBase transform_spaces;
 	
+	ListBase sound_handles;
 	
 	/* none of the dependancy graph  vars is mean to be saved */
 	struct  DagForest *theDag;
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
diff --git a/source/blender/makesdna/DNA_sound_types.h b/source/blender/makesdna/DNA_sound_types.h
index 5dedd20e1e4..841aae099cc 100644
--- a/source/blender/makesdna/DNA_sound_types.h
+++ b/source/blender/makesdna/DNA_sound_types.h
@@ -64,18 +64,43 @@ typedef struct bSample {
 	short us;
 } bSample;
 
-
+// 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;
+	float max_gain;
+	float reference_distance;
+	float max_distance;
+	float rolloff_factor;
+	float cone_inner_angle;
+	float cone_outer_angle;
+	float cone_outer_gain;
+} Sound3D;
 
 typedef struct bSound {
 	ID id;
 	char name[160];
-	struct bSample *sample;
-	void *stream;
+	struct bSample *sample; // AUD_XXX deprecated
+	void *stream; // AUD_XXX deprecated
 	struct PackedFile *packedfile;
-	struct PackedFile *newpackedfile;
-	void *snd_sound;
-	struct Ipo *ipo;
-	float volume, panning;
+	struct PackedFile *newpackedfile; // AUD_XXX deprecated
+	void *snd_sound; // AUD_XXX used for AUD_Sound now
+	struct Ipo *ipo; // AUD_XXX deprecated
+	float volume, panning; // AUD_XXX deprecated
 	/**
 	 * Sets the rollofffactor. The	rollofffactor is a per-Source parameter
 	 * the application can use to increase or decrease	the range of a source
@@ -84,27 +109,43 @@ typedef struct bSound {
 	 * value of 0, which indicates that the application does not wish any
 	 * distance attenuation on the respective Source.
 	 */
-	float attenuation;
-	float pitch;
+	float attenuation; // AUD_XXX deprecated
+	float pitch; // AUD_XXX deprecated
 	/**
 	 * min_gain indicates the minimal gain which is always guaranteed for this sound
 	 */
-	float min_gain;
+	float min_gain; // AUD_XXX deprecated
 	/**
 	 * max_gain indicates the maximal gain which is always guaranteed for this sound
 	 */
-	float max_gain;
+	float max_gain; // AUD_XXX deprecated
 	/**
 	 * Sets the referencedistance at which the listener will experience gain.
 	 */
-	float distance;
-	int flags;
-	int streamlen;
-	char channels;
-	char highprio;
-	char pad[10];
+	float distance; // AUD_XXX deprecated
+	int flags; // AUD_XXX deprecated
+	int streamlen; // AUD_XXX deprecated
+	char channels; // AUD_XXX deprecated
+	char highprio; // AUD_XXX deprecated
+	char pad[10]; // AUD_XXX deprecated
+
+	// AUD_XXX NEW
+	int type;
+	int changed;
+	struct bSound *child_sound;
+	void *cache;
+
+	// SOUND_TYPE_LIMITER
+	float start, end;
 } bSound;
 
+typedef enum eSound_Type {
+	SOUND_TYPE_INVALID = -1,
+	SOUND_TYPE_FILE = 0,
+	SOUND_TYPE_BUFFER,
+	SOUND_TYPE_LIMITER
+} eSound_Type;
+
 typedef struct bSoundListener {
 	ID id;
 	/**
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index f61b4b2904d..4a317dfb369 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -293,6 +293,11 @@ typedef struct UserDef {
 	short userpref, viewzoom;
 	
 	int mixbufsize;
+	int audiodevice;
+	int audiorate;
+	int audioformat;
+	int audiochannels;
+
 	int scrollback; /* console scrollback limit */
 	int dpi;		/* range 48-128? */
 	short encoding;