From de06cb85593baf27455509a16100d82cc5a81d92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20M=C3=BCller?= <nexyon@gmail.com>
Date: Tue, 16 Mar 2021 23:45:49 +0100
Subject: Bugfix: properly rename Null audio device to None

---
 source/blender/blenkernel/intern/sound.c          | 4 ++--
 source/blender/makesrna/intern/rna_userdef.c      | 2 +-
 source/blender/windowmanager/intern/wm_playanim.c | 2 +-
 source/creator/creator_args.c                     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'source')

diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index a33fedb3ea6..6dd1f66f6b5 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -413,7 +413,7 @@ void BKE_sound_init(Main *bmain)
   }
 
   if (!(sound_device = AUD_init(device_name, specs, buffersize, "Blender"))) {
-    sound_device = AUD_init("Null", specs, buffersize, "Blender");
+    sound_device = AUD_init("None", specs, buffersize, "Blender");
   }
 
   BKE_sound_init_main(bmain);
@@ -994,7 +994,7 @@ int BKE_sound_scene_playing(Scene *scene)
     return -1;
   }
 
-  /* In case of a "Null" audio device, we have no playback information. */
+  /* In case of a "None" audio device, we have no playback information. */
   if (AUD_Device_getRate(sound_device) == AUD_RATE_INVALID) {
     return -1;
   }
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 648b429acf6..edde5a1ed37 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -98,7 +98,7 @@ const EnumPropertyItem rna_enum_preference_section_items[] = {
 };
 
 static const EnumPropertyItem audio_device_items[] = {
-    {0, "Null", 0, "None", "Null device - there will be no audio output"},
+    {0, "None", 0, "None", "No device - there will be no audio output"},
     {0, NULL, 0, NULL, NULL},
 };
 
diff --git a/source/blender/windowmanager/intern/wm_playanim.c b/source/blender/windowmanager/intern/wm_playanim.c
index c95c8a6e44e..58030920fc7 100644
--- a/source/blender/windowmanager/intern/wm_playanim.c
+++ b/source/blender/windowmanager/intern/wm_playanim.c
@@ -1620,7 +1620,7 @@ void WM_main_playanim(int argc, const char **argv)
     AUD_initOnce();
 
     if (!(audio_device = AUD_init(NULL, specs, 1024, "Blender"))) {
-      audio_device = AUD_init("Null", specs, 0, "Blender");
+      audio_device = AUD_init("None", specs, 0, "Blender");
     }
   }
 #endif
diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c
index 5189af3ee85..d1899cc1408 100644
--- a/source/creator/creator_args.c
+++ b/source/creator/creator_args.c
@@ -1322,7 +1322,7 @@ static int arg_handle_audio_disable(int UNUSED(argc),
                                     const char **UNUSED(argv),
                                     void *UNUSED(data))
 {
-  BKE_sound_force_device("Null");
+  BKE_sound_force_device("None");
   return 0;
 }
 
-- 
cgit v1.2.3