Merge pull request #58972 from reduz/expose-more-gdextension

1 files changed, 28 insertions, 4 deletions

diff --git a/servers/audio/audio_stream.cpp b/servers/audio/audio_stream.cpp
index a710658bff..1ebd57fa7f 100644
--- a/servers/audio/audio_stream.cpp
+++ b/servers/audio/audio_stream.cpp
@@ -76,10 +76,10 @@ void AudioStreamPlayback::seek(float p_time) {
 
 int AudioStreamPlayback::mix(AudioFrame *p_buffer, float p_rate_scale, int p_frames) {
 	int ret;
-	if (GDVIRTUAL_CALL(_mix, p_buffer, p_rate_scale, p_frames, ret)) {
+	if (GDVIRTUAL_REQUIRED_CALL(_mix, p_buffer, p_rate_scale, p_frames, ret)) {
 		return ret;
 	}
-	WARN_PRINT_ONCE("AudioStreamPlayback::mix unimplemented!");
+
 	return 0;
 }
 
@@ -94,7 +94,7 @@ void AudioStreamPlayback::_bind_methods() {
 }
 //////////////////////////////
 
-void AudioStreamPlaybackResampled::_begin_resample() {
+void AudioStreamPlaybackResampled::begin_resample() {
 	//clear cubic interpolation history
 	internal_buffer[0] = AudioFrame(0.0, 0.0);
 	internal_buffer[1] = AudioFrame(0.0, 0.0);
@@ -105,6 +105,30 @@ void AudioStreamPlaybackResampled::_begin_resample() {
 	mix_offset = 0;
 }
 
+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;
+}
+float AudioStreamPlaybackResampled::get_stream_sampling_rate() {
+	float ret;
+	if (GDVIRTUAL_REQUIRED_CALL(_get_stream_sampling_rate, ret)) {
+		return ret;
+	}
+
+	return 0;
+}
+
+void AudioStreamPlaybackResampled::_bind_methods() {
+	ClassDB::bind_method(D_METHOD("begin_resample"), &AudioStreamPlaybackResampled::begin_resample);
+
+	GDVIRTUAL_BIND(_mix_resampled, "dst_buffer", "frame_count");
+	GDVIRTUAL_BIND(_get_stream_sampling_rate);
+}
+
 int AudioStreamPlaybackResampled::mix(AudioFrame *p_buffer, float p_rate_scale, int p_frames) {
 	float target_rate = AudioServer::get_singleton()->get_mix_rate();
 	float playback_speed_scale = AudioServer::get_singleton()->get_playback_speed_scale();
@@ -315,7 +339,7 @@ void AudioStreamPlaybackMicrophone::start(float p_from_pos) {
 
 	if (AudioDriver::get_singleton()->capture_start() == OK) {
 		active = true;
-		_begin_resample();
+		begin_resample();
 	}
 }