Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2016-10-14 14:22:22 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2016-10-14 14:22:22 +0300
commit3055ae509266436e9e5e954b011b94f99c679c51 (patch)
tree245c1a9d7b5e4c847c2a3c5c760f606f9610008b /source
parent49c2dbc5dbaefd3a2ff950dbb33e6190885d347e (diff)
Fix T49657: Audio backend "Jack" should be named "JACK".
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/sound.c2
-rw-r--r--source/blender/makesrna/intern/rna_userdef.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index 2f47966ec55..3132a8e27e7 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 b2aadbcaf0a..8ad016007f4 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}
};