[Bf-blender-cvs] [e56c5dd982f] blender2.8: Remove ifdef's default audio device

[Campbell Barton]

Commit: e56c5dd982ff80ee52ffd1bf1e36a2f3ff33a9b2
Author: Campbell Barton
Date:   Wed Sep 12 19:45:43 2018 +1000
Branches: blender2.8
https://developer.blender.org/rBe56c5dd982ff80ee52ffd1bf1e36a2f3ff33a9b2

Remove ifdef's default audio device

If we want to select an audio device based on build flags,
it should be done as a final step.

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

M	source/blender/blenloader/intern/versioning_userdef.c

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

diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c
index e888c23cd0a..d077784a361 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -135,12 +135,7 @@ void BLO_version_defaults_userpref_blend(Main *bmain, UserDef *userdef)
 		if (userdef->audiochannels == 0)
 			userdef->audiochannels = 2;
 		if (userdef->audiodevice == 0) {
-#ifdef WITH_OPENAL
-			userdef->audiodevice = 2;
-#endif
-#ifdef WITH_SDL
-			userdef->audiodevice = 1;
-#endif
+			userdef->audiodevice = 2;  /* OpenAL */
 		}
 		if (userdef->audioformat == 0)
 			userdef->audioformat = 0x24;