From d06a8320e5d5117f8a057da16d33443f410a5d9f Mon Sep 17 00:00:00 2001
From: kobewi <kobewi4e@gmail.com>
Date: Tue, 18 Oct 2022 18:47:44 +0200
Subject: Simplify GDVIRTUAL_CALL calls

---
 servers/audio/audio_effect.cpp |  8 +++---
 servers/audio/audio_stream.cpp | 58 +++++++++++++++---------------------------
 2 files changed, 23 insertions(+), 43 deletions(-)

(limited to 'servers/audio')

diff --git a/servers/audio/audio_effect.cpp b/servers/audio/audio_effect.cpp
index f38d0adfb2..ef0e3197e1 100644
--- a/servers/audio/audio_effect.cpp
+++ b/servers/audio/audio_effect.cpp
@@ -36,11 +36,9 @@ void AudioEffectInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_
 	}
 }
 bool AudioEffectInstance::process_silence() const {
-	bool ret;
-	if (GDVIRTUAL_CALL(_process_silence, ret)) {
-		return ret;
-	}
-	return false;
+	bool ret = false;
+	GDVIRTUAL_CALL(_process_silence, ret);
+	return ret;
 }
 
 void AudioEffectInstance::_bind_methods() {
diff --git a/servers/audio/audio_stream.cpp b/servers/audio/audio_stream.cpp
index 1bfe6a3eb5..33d4c816f2 100644
--- a/servers/audio/audio_stream.cpp
+++ b/servers/audio/audio_stream.cpp
@@ -54,11 +54,9 @@ bool AudioStreamPlayback::is_playing() const {
 }
 
 int AudioStreamPlayback::get_loop_count() const {
-	int ret;
-	if (GDVIRTUAL_CALL(_get_loop_count, ret)) {
-		return ret;
-	}
-	return 0;
+	int ret = 0;
+	GDVIRTUAL_CALL(_get_loop_count, ret);
+	return ret;
 }
 
 double AudioStreamPlayback::get_playback_position() const {
@@ -69,9 +67,7 @@ double AudioStreamPlayback::get_playback_position() const {
 	ERR_FAIL_V_MSG(0, "AudioStreamPlayback::get_playback_position unimplemented!");
 }
 void AudioStreamPlayback::seek(double p_time) {
-	if (GDVIRTUAL_CALL(_seek, p_time)) {
-		return;
-	}
+	GDVIRTUAL_CALL(_seek, p_time);
 }
 
 int AudioStreamPlayback::mix(AudioFrame *p_buffer, float p_rate_scale, int p_frames) {
@@ -201,58 +197,44 @@ Ref<AudioStreamPlayback> AudioStream::instantiate_playback() {
 }
 String AudioStream::get_stream_name() const {
 	String ret;
-	if (GDVIRTUAL_CALL(_get_stream_name, ret)) {
-		return ret;
-	}
-	return String();
+	GDVIRTUAL_CALL(_get_stream_name, ret);
+	return ret;
 }
 
 double AudioStream::get_length() const {
-	double ret;
-	if (GDVIRTUAL_CALL(_get_length, ret)) {
-		return ret;
-	}
-	return 0;
+	double ret = 0;
+	GDVIRTUAL_CALL(_get_length, ret);
+	return ret;
 }
 
 bool AudioStream::is_monophonic() const {
-	bool ret;
-	if (GDVIRTUAL_CALL(_is_monophonic, ret)) {
-		return ret;
-	}
-	return true;
+	bool ret = true;
+	GDVIRTUAL_CALL(_is_monophonic, ret);
+	return ret;
 }
 
 double AudioStream::get_bpm() const {
 	double ret = 0;
-	if (GDVIRTUAL_CALL(_get_bpm, ret)) {
-		return ret;
-	}
-	return 0;
+	GDVIRTUAL_CALL(_get_bpm, ret);
+	return ret;
 }
 
 bool AudioStream::has_loop() const {
 	bool ret = 0;
-	if (GDVIRTUAL_CALL(_has_loop, ret)) {
-		return ret;
-	}
-	return 0;
+	GDVIRTUAL_CALL(_has_loop, ret);
+	return ret;
 }
 
 int AudioStream::get_bar_beats() const {
 	int ret = 0;
-	if (GDVIRTUAL_CALL(_get_bar_beats, ret)) {
-		return ret;
-	}
-	return 0;
+	GDVIRTUAL_CALL(_get_bar_beats, ret);
+	return ret;
 }
 
 int AudioStream::get_beat_count() const {
 	int ret = 0;
-	if (GDVIRTUAL_CALL(_get_beat_count, ret)) {
-		return ret;
-	}
-	return 0;
+	GDVIRTUAL_CALL(_get_beat_count, ret);
+	return ret;
 }
 
 void AudioStream::tag_used(float p_offset) {
-- 
cgit v1.2.3