diff options
| author | Jörg Müller <nexyon@gmail.com> | 2015-07-24 16:44:17 +0300 |
|---|---|---|
| committer | Jörg Müller <nexyon@gmail.com> | 2015-07-28 15:01:53 +0300 |
| commit | 29ebb56f4d8b99ca3038c7a3d0ed794ef77ee7f9 (patch) | |
| tree | 32f1dae9ea80dd3c1843f5cc00ecceea23da5dc4 /source/blender/editors | |
| parent | a0cbebf404d6c46e59b090e7217ce39d7e760809 (diff) | |
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.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/interface/resources.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index e8311443123..a7eb33561b4 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -2641,6 +2641,12 @@ void init_userdef_do_versions(void) if (U.image_draw_method == 0) U.image_draw_method = IMAGE_DRAW_METHOD_2DTEXTURE; + // keep the following until the new audaspace is default to be built with +#ifdef WITH_SYSTEM_AUDASPACE + // we default to the first audio device + U.audiodevice = 0; +#endif + /* funny name, but it is GE stuff, moves userdef stuff to engine */ // XXX space_set_commmandline_options(); /* this timer uses U */ |