[Bf-blender-cvs] [e2e8f4b9e1d] blender2.8: Audaspace: removing old device backend names.

[Joerg Mueller]

Commit: e2e8f4b9e1d0820c276a10748b0e374b7aca6585
Author: Joerg Mueller
Date:   Tue Sep 19 18:00:35 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBe2e8f4b9e1d0820c276a10748b0e374b7aca6585

Audaspace: removing old device backend names.

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

M	source/blender/makesrna/intern/rna_userdef.c
M	source/creator/creator_args.c

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

diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 6a8b42913bd..1b6f5fd330e 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -66,16 +66,7 @@ static EnumPropertyItem opensubdiv_compute_type_items[] = {
 #endif
 
 static EnumPropertyItem audio_device_items[] = {
-	{0, "NONE", 0, "None", "Null device - there will be no audio output"},
-#ifdef WITH_SDL
-	{1, "SDL", 0, "SDL", "SDL device - simple direct media layer, recommended for sequencer usage"},
-#endif
-#ifdef WITH_OPENAL
-	{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"},
-#endif
+	{0, "Null", 0, "None", "Null device - there will be no audio output"},
 	{0, NULL, 0, NULL, NULL}
 };
 
diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c
index 76d9190f251..58948573fb3 100644
--- a/source/creator/creator_args.c
+++ b/source/creator/creator_args.c
@@ -1016,7 +1016,7 @@ static int arg_handle_audio_disable(int UNUSED(argc), const char **UNUSED(argv),
 }
 
 static const char arg_handle_audio_set_doc[] =
-"\n\tForce sound system to a specific device\n\tNULL SDL OPENAL JACK"
+"\n\tForce sound system to a specific device\n\tThe name is the same as found in the user preferences, e.g. OpenAL."
 ;
 static int arg_handle_audio_set(int argc, const char **argv, void *UNUSED(data))
 {