* Removing mocap GSoC (is an addon already).

* Fixing ffmpeg-0.8 errors.
* Fixing Ketsji paths.
* Removing DoSound from BGE.
* Fixing audio scene update to use only current scene objects.

4 files changed, 12 insertions, 14 deletions

diff --git a/source/blender/blenkernel/BKE_sound.h b/source/blender/blenkernel/BKE_sound.h
index ecf0d7e459a..e1b6ff02bc4 100644
--- a/source/blender/blenkernel/BKE_sound.h
+++ b/source/blender/blenkernel/BKE_sound.h
@@ -136,7 +136,7 @@ void sound_read_waveform(struct bSound* sound);
 
 int sound_get_channels(struct bSound* sound);
 
-void sound_update_scene(struct Main* bmain, struct Scene* scene);
+void sound_update_scene(struct Scene* scene);
 
 void* sound_get_factory(void* sound);
 
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 12e81e8296e..d6003a44a7d 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -968,7 +968,7 @@ static void scene_update_tagged_recursive(Main *bmain, Scene *scene, Scene *scen
 	scene_update_drivers(bmain, scene);
 
 	/* update sound system animation */
-	sound_update_scene(bmain, scene);
+	sound_update_scene(scene);
 }
 
 /* this is called in main loop, doing tagged updates before redraw */
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 4cec086aad4..bfbaa223a99 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -3150,18 +3150,14 @@ void seq_update_sound_bounds_all(Scene *scene)
 {
 	Editing *ed = scene->ed;
 
-	if(ed)
-	{
+	if(ed) {
 		Sequence *seq;
 
-		for(seq = ed->seqbase.first; seq; seq = seq->next)
-		{
-			if(seq->type == SEQ_META)
-			{
+		for(seq = ed->seqbase.first; seq; seq = seq->next) {
+			if(seq->type == SEQ_META) {
 				seq_update_sound_bounds_recursive(scene, seq);
 			}
-			else if(ELEM(seq->type, SEQ_SOUND, SEQ_SCENE))
-			{
+			else if(ELEM(seq->type, SEQ_SOUND, SEQ_SCENE)) {
 				seq_update_sound_bounds(scene, seq);
 			}
 		}
@@ -3170,8 +3166,7 @@ void seq_update_sound_bounds_all(Scene *scene)
 
 void seq_update_sound_bounds(Scene* scene, Sequence *seq)
 {
-	if(seq->scene_sound)
-	{
+	if(seq->scene_sound) {
 		sound_move_scene_sound(scene, seq->scene_sound, seq->startdisp, seq->enddisp, seq->startofs + seq->anim_startofs);
 		/* mute is set in seq_update_muting_recursive */
 	}
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index a364f860255..842923e63d0 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -24,6 +24,7 @@
 #include "DNA_sound_types.h"
 #include "DNA_speaker_types.h"
 
+#define WITH_AUDASPACE
 #ifdef WITH_AUDASPACE
 #  include "AUD_C-API.h"
 #endif
@@ -649,9 +650,10 @@ int sound_get_channels(struct bSound* sound)
 	return info.specs.channels;
 }
 
-void sound_update_scene(struct Main* bmain, struct Scene* scene)
+void sound_update_scene(struct Scene* scene)
 {
 	Object* ob;
+	Base* base;
 	NlaTrack* track;
 	NlaStrip* strip;
 	Speaker* speaker;
@@ -660,8 +662,9 @@ void sound_update_scene(struct Main* bmain, struct Scene* scene)
 	void* handle;
 	float quat[4];
 
-	for(ob = bmain->object.first; ob; ob = ob->id.next)
+	for(base = FIRSTBASE; base; base=base->next)
 	{
+		ob = base->object;
 		if(ob->type == OB_SPEAKER)
 		{
 			if(ob->adt)