Audaspace: support the device list returned by the new audaspace library.

- use the device names returned from the library.
- system settings UI changed as new audaspace might contain longer and more device names.

1 files changed, 13 insertions, 0 deletions

diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index b2af13aa106..1392009a30d 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -127,6 +127,7 @@ EnumPropertyItem navigation_mode_items[] = {
 #  include "sdlew.h"
 #endif
 
+
 static void rna_userdef_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *UNUSED(ptr))
 {
 	WM_main_add_notifier(NC_WINDOW, NULL);
@@ -610,6 +611,17 @@ static EnumPropertyItem *rna_userdef_audio_device_itemf(bContext *UNUSED(C), Poi
 	int totitem = 0;
 	EnumPropertyItem *item = NULL;
 
+#ifdef WITH_SYSTEM_AUDASPACE
+	int i;
+
+	char** names = BKE_sound_get_device_names();
+
+	for(i = 0; names[i]; i++)
+	{
+		EnumPropertyItem new_item = {i, names[i], 0, names[i], names[i]};
+		RNA_enum_item_add(&item, &totitem, &new_item);
+	}
+#else
 	/* NONE */
 	RNA_enum_item_add(&item, &totitem, &audio_device_items[index++]);
 
@@ -633,6 +645,7 @@ static EnumPropertyItem *rna_userdef_audio_device_itemf(bContext *UNUSED(C), Poi
 	}
 	index++;
 #endif
+#endif
 
 	RNA_enum_item_end(&item, &totitem);
 	*r_free = true;