1 files changed, 42 insertions, 69 deletions

diff --git a/servers/audio/audio_stream.cpp b/servers/audio/audio_stream.cpp
index 4252131161..4b68515e18 100644
--- a/servers/audio/audio_stream.cpp
+++ b/servers/audio/audio_stream.cpp
@@ -33,7 +33,7 @@
 #include "core/config/project_settings.h"
 #include "core/os/os.h"
 
-void AudioStreamPlayback::start(float p_from_pos) {
+void AudioStreamPlayback::start(double p_from_pos) {
 	if (GDVIRTUAL_CALL(_start, p_from_pos)) {
 		return;
 	}
@@ -54,33 +54,26 @@ 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;
 }
 
-float AudioStreamPlayback::get_playback_position() const {
-	float ret;
+double AudioStreamPlayback::get_playback_position() const {
+	double ret;
 	if (GDVIRTUAL_CALL(_get_playback_position, ret)) {
 		return ret;
 	}
 	ERR_FAIL_V_MSG(0, "AudioStreamPlayback::get_playback_position unimplemented!");
 }
-void AudioStreamPlayback::seek(float p_time) {
-	if (GDVIRTUAL_CALL(_seek, p_time)) {
-		return;
-	}
+void AudioStreamPlayback::seek(double p_time) {
+	GDVIRTUAL_CALL(_seek, 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() {
@@ -111,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() {
@@ -201,58 +188,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;
 }
 
-float AudioStream::get_length() const {
-	float ret;
-	if (GDVIRTUAL_CALL(_get_length, ret)) {
-		return ret;
-	}
-	return 0;
+double AudioStream::get_length() const {
+	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) {
@@ -309,7 +282,7 @@ String AudioStreamMicrophone::get_stream_name() const {
 	return "Microphone";
 }
 
-float AudioStreamMicrophone::get_length() const {
+double AudioStreamMicrophone::get_length() const {
 	return 0;
 }
 
@@ -382,7 +355,7 @@ float AudioStreamPlaybackMicrophone::get_stream_sampling_rate() {
 	return AudioDriver::get_singleton()->get_mix_rate();
 }
 
-void AudioStreamPlaybackMicrophone::start(float p_from_pos) {
+void AudioStreamPlaybackMicrophone::start(double p_from_pos) {
 	if (active) {
 		return;
 	}
@@ -415,11 +388,11 @@ int AudioStreamPlaybackMicrophone::get_loop_count() const {
 	return 0;
 }
 
-float AudioStreamPlaybackMicrophone::get_playback_position() const {
+double AudioStreamPlaybackMicrophone::get_playback_position() const {
 	return 0;
 }
 
-void AudioStreamPlaybackMicrophone::seek(float p_time) {
+void AudioStreamPlaybackMicrophone::seek(double p_time) {
 	// Can't seek a microphone input
 }
 
@@ -664,7 +637,7 @@ String AudioStreamRandomizer::get_stream_name() const {
 	return "Randomizer";
 }
 
-float AudioStreamRandomizer::get_length() const {
+double AudioStreamRandomizer::get_length() const {
 	return 0;
 }
 
@@ -769,7 +742,7 @@ void AudioStreamRandomizer::_bind_methods() {
 
 AudioStreamRandomizer::AudioStreamRandomizer() {}
 
-void AudioStreamPlaybackRandomizer::start(float p_from_pos) {
+void AudioStreamPlaybackRandomizer::start(double p_from_pos) {
 	playing = playback;
 	{
 		float range_from = 1.0 / randomizer->random_pitch_scale;
@@ -812,7 +785,7 @@ int AudioStreamPlaybackRandomizer::get_loop_count() const {
 	return 0;
 }
 
-float AudioStreamPlaybackRandomizer::get_playback_position() const {
+double AudioStreamPlaybackRandomizer::get_playback_position() const {
 	if (playing.is_valid()) {
 		return playing->get_playback_position();
 	}
@@ -820,7 +793,7 @@ float AudioStreamPlaybackRandomizer::get_playback_position() const {
 	return 0;
 }
 
-void AudioStreamPlaybackRandomizer::seek(float p_time) {
+void AudioStreamPlaybackRandomizer::seek(double p_time) {
 	if (playing.is_valid()) {
 		playing->seek(p_time);
 	}