diff options
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/sound.c | 4 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_playanim.c | 2 |
3 files changed, 4 insertions, 4 deletions
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 |