-noaudio option to force the sound system to None.

Useful when openAL is not setup properly (*cough* pulseaudio *cough) and prevents startup.

This doesn't actually affect the userpref option, so you can set it to whatever you want, save userprefs and restart.

1 files changed, 5 insertions, 1 deletions

diff --git a/source/creator/creator.c b/source/creator/creator.c
index 3a9ee9859e8..b6c08582144 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -62,6 +62,7 @@
 #include "BKE_scene.h"
 #include "BKE_node.h"
 #include "BKE_report.h"
+#include "BKE_sound.h"
 
 #include "IMB_imbuf.h"	// for quicktime_init
 
@@ -219,6 +220,7 @@ static void print_help(void)
 	printf ("  -d\t\tTurn debugging on\n");
 	printf ("  -nojoystick\tDisable joystick support\n");
 	printf ("  -noglsl\tDisable GLSL shading\n");
+	printf ("  -noaudio\tForce sound system to None\n");
 	printf ("  -h\t\tPrint this help text\n");
 	printf ("  -y\t\tDisable automatic python script execution (pydrivers, pyconstraints, pynodes)\n");
 	printf ("  -P <filename>\tRun the given Python script (filename or Blender Text)\n");
@@ -482,8 +484,10 @@ int main(int argc, char **argv)
 						SYS_WriteCommandLineInt(syshandle,"nojoystick",1);
 						if (G.f & G_DEBUG) printf("disabling nojoystick\n");
 					}
-					if (BLI_strcasecmp(argv[a], "-noglsl") == 0)
+					else if (BLI_strcasecmp(argv[a], "-noglsl") == 0)
 						GPU_extensions_disable();
+					else if (BLI_strcasecmp(argv[a], "-noaudio") == 0)
+						sound_disable();
 					break;
 				}
 			}