2.5 audio cleanup:
[blender.git] / source / creator / creator.c
index 9034833563b131197cb998e6c9e984b1b99f504a..8896673b6112767095724ec0894ef3a7baa201e3 100644 (file)
@@ -201,13 +201,11 @@ static void print_help(void)
        printf ("\nGame Engine specific options:\n");
        printf ("  -g fixedtime\t\tRun on 50 hertz without dropping frames\n");
        printf ("  -g vertexarrays\tUse Vertex Arrays for rendering (usually faster)\n");
-       printf ("  -g noaudio\t\tNo audio in Game Engine\n");
        printf ("  -g nomipmap\t\tNo Texture Mipmapping\n");
        printf ("  -g linearmipmap\tLinear Texture Mipmapping instead of Nearest (default)\n");
 
        printf ("\nMisc options:\n");
        printf ("  -d\t\tTurn debugging on\n");
-       printf ("  -noaudio\tDisable audio on systems that support audio\n");
        printf ("  -nojoystick\tDisable joystick support\n");
        printf ("  -noglsl\tDisable GLSL shading\n");
        printf ("  -h\t\tPrint this help text\n");
@@ -267,13 +265,6 @@ int main(int argc, char **argv)
        bContext *C= CTX_create();
        int a, i, stax, stay, sizx, sizy /*XXX, scr_init = 0*/;
 
-#if defined(WIN32) || defined (__linux__)
-       int audio = 1;
-#else
-       int audio = 0;
-#endif
-
-       
 #ifdef WITH_BINRELOC
        br_init( NULL );
 #endif
@@ -462,16 +453,6 @@ int main(int argc, char **argv)
                                        break;
                                case 'n':
                                case 'N':
-                                       if (BLI_strcasecmp(argv[a], "-noaudio") == 0|| BLI_strcasecmp(argv[a], "-nosound") == 0) {
-                                               /**
-                                                       notify the gameengine that no audio is wanted, even if the user didn't give
-                                                       the flag -g noaudio.
-                                               */
-
-                                               SYS_WriteCommandLineInt(syshandle,"noaudio",1);
-                                               audio = 0;
-                                               if (G.f & G_DEBUG) printf("setting audio to: %d\n", audio);
-                                       }
                                        if (BLI_strcasecmp(argv[a], "-nojoystick") == 0) {
                                                /**
                                                        don't initialize joysticks if user doesn't want to use joysticks
@@ -490,11 +471,6 @@ int main(int argc, char **argv)
 #ifndef DISABLE_PYTHON         
                BPY_start_python(argc, argv);
 #endif         
-               /**
-                * NOTE: sound_init_audio() *must be* after start_python,
-                * at least on FreeBSD.
-                * added note (ton): i removed it altogether
-                */
 
                WM_init(C);
                
@@ -515,12 +491,6 @@ int main(int argc, char **argv)
                BPY_start_python(argc, argv);
 #endif         
                BLI_where_is_temp( btempdir, 0 ); /* call after loading the .B.blend so we can read U.tempdir */
-               
-               // (ton) Commented out. I have no idea whats thisfor... will mail around!
-               // SYS_WriteCommandLineInt(syshandle,"noaudio",1);
-        // audio = 0;
-        // sound_init_audio();
-        // if (G.f & G_DEBUG) printf("setting audio to: %d\n", audio);
        }
 #ifndef DISABLE_PYTHON
        /**