[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22798] branches/blender2.5/blender/source /blender: Changed default audio device from SDL to OpenAL after a discussion in IRC, we're testing if OpenAL works flawlessly on all plattforms and if so we' ll keep it as default device as it supports 3D Audio for the GE what SDL doesn 't.

[Joerg Mueller]

Revision: 22798
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22798
Author:   nexyon
Date:     2009-08-26 10:09:29 +0200 (Wed, 26 Aug 2009)

Log Message:
-----------
Changed default audio device from SDL to OpenAL after a discussion in IRC, we're testing if OpenAL works flawlessly on all plattforms and if so we'll keep it as default device as it supports 3D Audio for the GE what SDL doesn't.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/blenkernel/intern/sound.c
    branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c

Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/sound.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/sound.c	2009-08-26 07:59:58 UTC (rev 22797)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/sound.c	2009-08-26 08:09:29 UTC (rev 22798)
@@ -34,7 +34,7 @@
 void sound_init()
 {
 	AUD_Specs specs;
-	int device, buffersize, success;
+	int device, buffersize;
 
 	device = U.audiodevice;
 	buffersize = U.mixbufsize;
@@ -54,15 +54,8 @@
 	if(specs.channels <= AUD_CHANNELS_INVALID)
 		specs.channels = AUD_CHANNELS_STEREO;
 
-	if(!AUD_init(device, specs, buffersize)) {
-		if(device == AUD_SDL_DEVICE)
-			success= AUD_init(AUD_OPENAL_DEVICE, specs, AUD_DEFAULT_BUFFER_SIZE*4);
-		else
-			success= AUD_init(AUD_SDL_DEVICE, specs, AUD_DEFAULT_BUFFER_SIZE*4);
-
-		if(!success)
-			AUD_init(AUD_NULL_DEVICE, specs, buffersize);
-	}
+	if(!AUD_init(device, specs, buffersize))
+		AUD_init(AUD_NULL_DEVICE, specs, buffersize);
 }
 
 void sound_exit()

Modified: branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c	2009-08-26 07:59:58 UTC (rev 22797)
+++ branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c	2009-08-26 08:09:29 UTC (rev 22798)
@@ -9675,13 +9675,13 @@
 	bfd->user->uifonts.first= bfd->user->uifonts.last= NULL;
 	bfd->user->uistyles.first= bfd->user->uistyles.last= NULL;
 
-	// AUD_XXX
+	// AUD_XXX that's bad because if the user has saved No Audio, it changes to OpenAL always
 	if(bfd->user->audiochannels == 0)
 		bfd->user->audiochannels = 2;
 	if(bfd->user->audiodevice == 0)
-		bfd->user->audiodevice = 1;
+		bfd->user->audiodevice = 2;
 	if(bfd->user->audioformat == 0)
-		bfd->user->audioformat = 0x12;
+		bfd->user->audioformat = 0x24;
 	if(bfd->user->audiorate == 0)
 		bfd->user->audiorate = 44100;