[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26453] trunk/blender/source: Preparation to force an audio device via command line.

[Joerg Mueller]

Revision: 26453
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26453
Author:   nexyon
Date:     2010-01-30 22:04:51 +0100 (Sat, 30 Jan 2010)

Log Message:
-----------
Preparation to force an audio device via command line. Will be implemented by theeth.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_sound.h
    trunk/blender/source/blender/blenkernel/intern/sound.c
    trunk/blender/source/creator/creator.c

Modified: trunk/blender/source/blender/blenkernel/BKE_sound.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_sound.h	2010-01-30 19:42:03 UTC (rev 26452)
+++ trunk/blender/source/blender/blenkernel/BKE_sound.h	2010-01-30 21:04:51 UTC (rev 26453)
@@ -41,7 +41,7 @@
 
 void sound_exit();
 
-void sound_disable();
+void sound_force_device(int device);
 
 struct bSound* sound_new_file(struct Main *main, char* filename);
 

Modified: trunk/blender/source/blender/blenkernel/intern/sound.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sound.c	2010-01-30 19:42:03 UTC (rev 26452)
+++ trunk/blender/source/blender/blenkernel/intern/sound.c	2010-01-30 21:04:51 UTC (rev 26453)
@@ -31,11 +31,11 @@
 #include <config.h>
 #endif
 
-static int sound_disabled = 0;
+static int force_device = -1;
 
-void sound_disable()
+void sound_force_device(int device)
 {
-	sound_disabled = 1;
+	force_device = device;
 }
 
 void sound_init()
@@ -49,8 +49,8 @@
 	specs.format = U.audioformat;
 	specs.rate = U.audiorate;
 
-	if (sound_disabled)
-		device = 0;
+	if(force_device >= 0)
+		device = force_device;
 
 	if(buffersize < 128)
 		buffersize = AUD_DEFAULT_BUFFER_SIZE;

Modified: trunk/blender/source/creator/creator.c
===================================================================
--- trunk/blender/source/creator/creator.c	2010-01-30 19:42:03 UTC (rev 26452)
+++ trunk/blender/source/creator/creator.c	2010-01-30 21:04:51 UTC (rev 26453)
@@ -487,7 +487,7 @@
 					else if (BLI_strcasecmp(argv[a], "-noglsl") == 0)
 						GPU_extensions_disable();
 					else if (BLI_strcasecmp(argv[a], "-noaudio") == 0)
-						sound_disable();
+						sound_force_device(0);
 					break;
 				}
 			}
@@ -527,7 +527,7 @@
 				case 'n':
 				case 'N':
 					if (BLI_strcasecmp(argv[a], "-noaudio") == 0)
-						sound_disable();
+						sound_force_device(0);
 					break;
 				}
 			}