diff options
author | Jörg Müller <nexyon@gmail.com> | 2021-03-17 00:32:16 +0300 |
---|---|---|
committer | Jörg Müller <nexyon@gmail.com> | 2021-03-17 01:21:45 +0300 |
commit | 7b8fc307dc4ff608fc68e2decee45bae59f0c7c9 (patch) | |
tree | 9690b32b66aec4595df83e92f9595a819b715339 /source | |
parent | 262a0988466e95ab31b834a6479b8be7ec1023d6 (diff) |
Audaspace: porting minor improvements from upstream
- NullDevice is now called None
- Automatic choice of best available device.
- Minor formatting, documentation and cmake fixes.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/windowmanager/intern/wm_playanim.c | 2 | ||||
-rw-r--r-- | source/creator/creator_args.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_playanim.c b/source/blender/windowmanager/intern/wm_playanim.c index 02a8951e60e..c95c8a6e44e 100644 --- a/source/blender/windowmanager/intern/wm_playanim.c +++ b/source/blender/windowmanager/intern/wm_playanim.c @@ -1619,7 +1619,7 @@ void WM_main_playanim(int argc, const char **argv) AUD_initOnce(); - if (!(audio_device = AUD_init("OpenAL", specs, 1024, "Blender"))) { + if (!(audio_device = AUD_init(NULL, specs, 1024, "Blender"))) { audio_device = AUD_init("Null", specs, 0, "Blender"); } } diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c index 7316c1729f5..22a56165ab4 100644 --- a/source/creator/creator_args.c +++ b/source/creator/creator_args.c @@ -1330,7 +1330,7 @@ static const char arg_handle_audio_set_doc[] = "\n\t" "Force sound system to a specific device." "\n\t" - "'NULL' 'SDL' 'OPENAL' 'JACK'."; + "'None' 'SDL' 'OpenAL' 'JACK'."; static int arg_handle_audio_set(int argc, const char **argv, void *UNUSED(data)) { if (argc < 1) { |