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
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-09-12 12:45:43 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-09-12 12:49:25 +0300
commite56c5dd982ff80ee52ffd1bf1e36a2f3ff33a9b2 (patch)
tree90b1c342e2a51f5971f51f7f3516c45f3d09de09 /source/blender/blenloader/intern/versioning_userdef.c
parent4464a86a6e0d368209995ea5ea52990e1656b356 (diff)
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.
Diffstat (limited to 'source/blender/blenloader/intern/versioning_userdef.c')
-rw-r--r--source/blender/blenloader/intern/versioning_userdef.c7
1 files changed, 1 insertions, 6 deletions
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;