diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-09-26 13:45:31 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-09-26 13:45:31 +0200 |
| commit | 2c8c7b95aa93d0e777c2a28ddb759546819e4470 (patch) | |
| tree | 30b5999a727b4ef63959a9156c5b4c5122bc5f7a /servers/audio_server.cpp | |
| parent | a4bca123363063551676f2b35578a45391845a3a (diff) | |
| parent | fdd3d36c6d09923f4e458d4526a7b968e7e026d8 (diff) | |
| download | redot-engine-2c8c7b95aa93d0e777c2a28ddb759546819e4470.tar.gz | |
Merge pull request #82313 from AThousandShips/null_check_servers
[Servers] Replace `ERR_FAIL_COND` with `ERR_FAIL_NULL` where applicable
Diffstat (limited to 'servers/audio_server.cpp')
| -rw-r--r-- | servers/audio_server.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/servers/audio_server.cpp b/servers/audio_server.cpp index ce7f6ee6f0..511a8b3122 100644 --- a/servers/audio_server.cpp +++ b/servers/audio_server.cpp @@ -389,7 +389,7 @@ void AudioServer::_mix_step() { } AudioStreamPlaybackBusDetails *ptr = playback->bus_details.load(); - ERR_FAIL_COND(ptr == nullptr); + ERR_FAIL_NULL(ptr); // By putting null into the bus details pointers, we're taking ownership of their memory for the duration of this mix. AudioStreamPlaybackBusDetails bus_details = *ptr; @@ -620,8 +620,8 @@ void AudioServer::_mix_step_for_channel(AudioFrame *p_out_buf, AudioFrame *p_sou filter.set_stages(1); filter.set_gain(p_highshelf_gain); - ERR_FAIL_COND(p_processor_l == nullptr); - ERR_FAIL_COND(p_processor_r == nullptr); + ERR_FAIL_NULL(p_processor_l); + ERR_FAIL_NULL(p_processor_r); bool is_just_started = p_vol_start.l == 0 && p_vol_start.r == 0; p_processor_l->set_filter(&filter, /* clear_history= */ is_just_started); |