Simplify GDVIRTUAL_REQUIRED_CALL calls

3 files changed, 28 insertions, 52 deletions

diff --git a/servers/audio/audio_effect.cpp b/servers/audio/audio_effect.cpp
index ef0e3197e1..870a77806b 100644
--- a/servers/audio/audio_effect.cpp
+++ b/servers/audio/audio_effect.cpp
@@ -31,9 +31,7 @@
 #include "audio_effect.h"
 
 void AudioEffectInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) {
-	if (GDVIRTUAL_REQUIRED_CALL(_process, p_src_frames, p_dst_frames, p_frame_count)) {
-		return;
-	}
+	GDVIRTUAL_REQUIRED_CALL(_process, p_src_frames, p_dst_frames, p_frame_count);
 }
 bool AudioEffectInstance::process_silence() const {
 	bool ret = false;
@@ -50,10 +48,8 @@ void AudioEffectInstance::_bind_methods() {
 
 Ref<AudioEffectInstance> AudioEffect::instantiate() {
 	Ref<AudioEffectInstance> ret;
-	if (GDVIRTUAL_REQUIRED_CALL(_instantiate, ret)) {
-		return ret;
-	}
-	return Ref<AudioEffectInstance>();
+	GDVIRTUAL_REQUIRED_CALL(_instantiate, ret);
+	return ret;
 }
 void AudioEffect::_bind_methods() {
 	GDVIRTUAL_BIND(_instantiate);
diff --git a/servers/audio/audio_stream.cpp b/servers/audio/audio_stream.cpp
index 33d4c816f2..4b68515e18 100644
--- a/servers/audio/audio_stream.cpp
+++ b/servers/audio/audio_stream.cpp
@@ -71,12 +71,9 @@ void AudioStreamPlayback::seek(double p_time) {
 }
 
 int AudioStreamPlayback::mix(AudioFrame *p_buffer, float p_rate_scale, int p_frames) {
-	int ret;
-	if (GDVIRTUAL_REQUIRED_CALL(_mix, p_buffer, p_rate_scale, p_frames, ret)) {
-		return ret;
-	}
-
-	return 0;
+	int ret = 0;
+	GDVIRTUAL_REQUIRED_CALL(_mix, p_buffer, p_rate_scale, p_frames, ret);
+	return ret;
 }
 
 void AudioStreamPlayback::tag_used_streams() {
@@ -107,20 +104,14 @@ void AudioStreamPlaybackResampled::begin_resample() {
 }
 
 int AudioStreamPlaybackResampled::_mix_internal(AudioFrame *p_buffer, int p_frames) {
-	int ret;
-	if (GDVIRTUAL_REQUIRED_CALL(_mix_resampled, p_buffer, p_frames, ret)) {
-		return ret;
-	}
-
-	return 0;
+	int ret = 0;
+	GDVIRTUAL_REQUIRED_CALL(_mix_resampled, p_buffer, p_frames, ret);
+	return ret;
 }
 float AudioStreamPlaybackResampled::get_stream_sampling_rate() {
-	float ret;
-	if (GDVIRTUAL_REQUIRED_CALL(_get_stream_sampling_rate, ret)) {
-		return ret;
-	}
-
-	return 0;
+	float ret = 0;
+	GDVIRTUAL_REQUIRED_CALL(_get_stream_sampling_rate, ret);
+	return ret;
 }
 
 void AudioStreamPlaybackResampled::_bind_methods() {
diff --git a/servers/movie_writer/movie_writer.cpp b/servers/movie_writer/movie_writer.cpp
index 0edce4ced6..419943f2d2 100644
--- a/servers/movie_writer/movie_writer.cpp
+++ b/servers/movie_writer/movie_writer.cpp
@@ -52,34 +52,26 @@ MovieWriter *MovieWriter::find_writer_for_file(const String &p_file) {
 }
 
 uint32_t MovieWriter::get_audio_mix_rate() const {
-	uint32_t ret = 0;
-	if (GDVIRTUAL_REQUIRED_CALL(_get_audio_mix_rate, ret)) {
-		return ret;
-	}
-	return 48000;
+	uint32_t ret = 48000;
+	GDVIRTUAL_REQUIRED_CALL(_get_audio_mix_rate, ret);
+	return ret;
 }
 AudioServer::SpeakerMode MovieWriter::get_audio_speaker_mode() const {
 	AudioServer::SpeakerMode ret = AudioServer::SPEAKER_MODE_STEREO;
-	if (GDVIRTUAL_REQUIRED_CALL(_get_audio_speaker_mode, ret)) {
-		return ret;
-	}
-	return AudioServer::SPEAKER_MODE_STEREO;
+	GDVIRTUAL_REQUIRED_CALL(_get_audio_speaker_mode, ret);
+	return ret;
 }
 
 Error MovieWriter::write_begin(const Size2i &p_movie_size, uint32_t p_fps, const String &p_base_path) {
-	Error ret = OK;
-	if (GDVIRTUAL_REQUIRED_CALL(_write_begin, p_movie_size, p_fps, p_base_path, ret)) {
-		return ret;
-	}
-	return ERR_UNCONFIGURED;
+	Error ret = ERR_UNCONFIGURED;
+	GDVIRTUAL_REQUIRED_CALL(_write_begin, p_movie_size, p_fps, p_base_path, ret);
+	return ret;
 }
 
 Error MovieWriter::write_frame(const Ref<Image> &p_image, const int32_t *p_audio_data) {
-	Error ret = OK;
-	if (GDVIRTUAL_REQUIRED_CALL(_write_frame, p_image, p_audio_data, ret)) {
-		return ret;
-	}
-	return ERR_UNCONFIGURED;
+	Error ret = ERR_UNCONFIGURED;
+	GDVIRTUAL_REQUIRED_CALL(_write_frame, p_image, p_audio_data, ret);
+	return ret;
 }
 
 void MovieWriter::write_end() {
@@ -88,18 +80,15 @@ void MovieWriter::write_end() {
 
 bool MovieWriter::handles_file(const String &p_path) const {
 	bool ret = false;
-	if (GDVIRTUAL_REQUIRED_CALL(_handles_file, p_path, ret)) {
-		return ret;
-	}
-	return false;
+	GDVIRTUAL_REQUIRED_CALL(_handles_file, p_path, ret);
+	return ret;
 }
 
 void MovieWriter::get_supported_extensions(List<String> *r_extensions) const {
 	Vector<String> exts;
-	if (GDVIRTUAL_REQUIRED_CALL(_get_supported_extensions, exts)) {
-		for (int i = 0; i < exts.size(); i++) {
-			r_extensions->push_back(exts[i]);
-		}
+	GDVIRTUAL_REQUIRED_CALL(_get_supported_extensions, exts);
+	for (int i = 0; i < exts.size(); i++) {
+		r_extensions->push_back(exts[i]);
 	}
 }