[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26712] trunk/blender/intern/audaspace/ intern: 2.5 Audio:

[Joerg Mueller]

Revision: 26712
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26712
Author:   nexyon
Date:     2010-02-08 16:37:38 +0100 (Mon, 08 Feb 2010)

Log Message:
-----------
2.5 Audio:

- Using libsamplerate again, doesn't seem to be the bug source.
- Changed sequencer audio to work with 2 channels and 44.1 kHz fixed.

Modified Paths:
--------------
    trunk/blender/intern/audaspace/intern/AUD_C-API.cpp
    trunk/blender/intern/audaspace/intern/AUD_Mixer.h

Modified: trunk/blender/intern/audaspace/intern/AUD_C-API.cpp
===================================================================
--- trunk/blender/intern/audaspace/intern/AUD_C-API.cpp	2010-02-08 15:28:28 UTC (rev 26711)
+++ trunk/blender/intern/audaspace/intern/AUD_C-API.cpp	2010-02-08 15:37:38 UTC (rev 26712)
@@ -671,17 +671,15 @@
 
 AUD_Sound* AUD_createSequencer(void* data, AUD_volumeFunction volume)
 {
-	if(AUD_device)
-	{
-		return new AUD_SequencerFactory(AUD_device->getSpecs().specs, data, volume);
-	}
-	else
-	{
-		AUD_Specs specs;
-		specs.channels = AUD_CHANNELS_STEREO;
-		specs.rate = AUD_RATE_44100;
-		return new AUD_SequencerFactory(specs, data, volume);
-	}
+/* AUD_XXX should be this: but AUD_createSequencer is called before the device
+ * is initialized.
+
+	return new AUD_SequencerFactory(AUD_device->getSpecs().specs, data, volume);
+*/
+	AUD_Specs specs;
+	specs.channels = AUD_CHANNELS_STEREO;
+	specs.rate = AUD_RATE_44100;
+	return new AUD_SequencerFactory(specs, data, volume);
 }
 
 void AUD_destroySequencer(AUD_Sound* sequencer)

Modified: trunk/blender/intern/audaspace/intern/AUD_Mixer.h
===================================================================
--- trunk/blender/intern/audaspace/intern/AUD_Mixer.h	2010-02-08 15:28:28 UTC (rev 26711)
+++ trunk/blender/intern/audaspace/intern/AUD_Mixer.h	2010-02-08 15:37:38 UTC (rev 26712)
@@ -26,7 +26,7 @@
 #ifndef AUD_MIXER
 #define AUD_MIXER
 
-#define AUD_MIXER_RESAMPLER AUD_LinearResampleFactory
+#define AUD_MIXER_RESAMPLER AUD_SRCResampleFactory
 
 #include "AUD_ConverterFunctions.h"
 class AUD_ConverterFactory;