Removed game_sound property as it is not working and not necessary anymore.
authorJoerg Mueller <nexyon@gmail.com>
Sat, 9 Jan 2010 22:28:05 +0000 (22:28 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Sat, 9 Jan 2010 22:28:05 +0000 (22:28 +0000)
release/scripts/ui/space_userpref.py
source/blender/editors/space_view3d/view3d_view.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_userdef.c

index 3e801f4..534735b 100644 (file)
@@ -408,7 +408,6 @@ class USERPREF_PT_system(bpy.types.Panel):
         sub = col.column()
         sub.active = system.audio_device != 'NONE'
         #sub.prop(system, "enable_all_codecs")
-        sub.prop(system, "game_sound")
         sub.prop(system, "audio_channels", text="Channels")
         sub.prop(system, "audio_mixing_buffer", text="Mixing Buffer")
         sub.prop(system, "audio_sample_rate", text="Sample Rate")
index b7bc71f..adb1e6c 100644 (file)
@@ -1656,11 +1656,6 @@ void game_set_commmandline_options(GameData *gm)
 
        if ( (syshandle = SYS_GetSystem()) ) {
                /* User defined settings */
-               test= (U.gameflags & USER_DISABLE_SOUND);
-               /* if user already disabled audio at the command-line, don't re-enable it */
-               if (test)
-                       SYS_WriteCommandLineInt(syshandle, "noaudio", test);
-
                test= (U.gameflags & USER_DISABLE_MIPMAP);
                GPU_set_mipmap(!test);
                SYS_WriteCommandLineInt(syshandle, "nomipmap", test);
index 4b5b005..bd8573f 100644 (file)
@@ -467,7 +467,8 @@ extern UserDef U; /* from blenkernel blender.c */
 
 /* gameflags */
 #define USER_DEPRECATED_FLAG   1
-#define USER_DISABLE_SOUND             2
+// #define USER_DISABLE_SOUND          2 deprecated, don't use without checking for
+// backwards compatibilty in do_versions!
 #define USER_DISABLE_MIPMAP            4
 #define USER_DISABLE_VBO               8
 #define USER_DISABLE_AA                        16
index 1ad2387..bc0e11b 100644 (file)
@@ -2204,10 +2204,6 @@ static void rna_def_userdef_system(BlenderRNA *brna)
        RNA_def_property_range(prop, 0, 32727);
        RNA_def_property_ui_text(prop, "Frame Server Port", "Frameserver Port for Framserver-Rendering.");
 
-       prop= RNA_def_property(srna, "game_sound", PROP_BOOLEAN, PROP_NONE);
-       RNA_def_property_boolean_negative_sdna(prop, NULL, "gameflags", USER_DISABLE_SOUND);
-       RNA_def_property_ui_text(prop, "Game Sound", "Enables sounds to be played in games.");
-
        prop= RNA_def_property(srna, "clip_alpha", PROP_FLOAT, PROP_NONE);
        RNA_def_property_float_sdna(prop, NULL, "glalphaclip");
        RNA_def_property_range(prop, 0.0f, 1.0f);