Commit: 3055ae509266436e9e5e954b011b94f99c679c51
Author: Bastien Montagne
Date:   Fri Oct 14 13:22:22 2016 +0200
Branches: master
https://developer.blender.org/rB3055ae509266436e9e5e954b011b94f99c679c51

Fix T49657: Audio backend "Jack" should be named "JACK".

===================================================================

M       source/blender/blenkernel/intern/sound.c
M       source/blender/makesrna/intern/rna_userdef.c

===================================================================

diff --git a/source/blender/blenkernel/intern/sound.c 
b/source/blender/blenkernel/intern/sound.c
index 2f47966..3132a8e 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -865,7 +865,7 @@ char **BKE_sound_get_device_names(void)
                audio_device_names = AUD_getDeviceNames();
 #else
                static const char *names[] = {
-                       "Null", "SDL", "OpenAL", "Jack", NULL
+                       "Null", "SDL", "OpenAL", "JACK", NULL
                };
                audio_device_names = (char **)names;
 #endif
diff --git a/source/blender/makesrna/intern/rna_userdef.c 
b/source/blender/makesrna/intern/rna_userdef.c
index b2aadbc..8ad0160 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -83,7 +83,7 @@ static EnumPropertyItem audio_device_items[] = {
        {2, "OPENAL", 0, "OpenAL", "OpenAL device - supports 3D audio, 
recommended for game engine usage"},
 #endif
 #ifdef WITH_JACK
-       {3, "JACK", 0, "Jack", "JACK - Audio Connection Kit, recommended for 
pro audio users"},
+       {3, "JACK", 0, "JACK", "JACK Audio Connection Kit, recommended for pro 
audio users"},
 #endif
        {0, NULL, 0, NULL, NULL}
 };

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to