summaryrefslogtreecommitdiff
path: root/scene/resources/audio_stream_sample.h
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2021-08-27 15:38:20 -0300
committerGitHub <noreply@github.com>2021-08-27 15:38:20 -0300
commit54caaa21ce427ac3b240d5b514dc339fd8e13204 (patch)
treefc2bfcdf0c1cc8fc8fd66e9bf68c1b74b006b4f9 /scene/resources/audio_stream_sample.h
parent87f575efddf503297e056f169cfd8a68dbe859c5 (diff)
parent3598d300cb43797a4f18b34d921875d060ce7de7 (diff)
Merge pull request #51296 from ellenhp/mix_in_audio_server
Move mixing out of the AudioStreamPlayback* nodes
Diffstat (limited to 'scene/resources/audio_stream_sample.h')
-rw-r--r--scene/resources/audio_stream_sample.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/resources/audio_stream_sample.h b/scene/resources/audio_stream_sample.h
index 70b8ba79ad..8bf3d29123 100644
--- a/scene/resources/audio_stream_sample.h
+++ b/scene/resources/audio_stream_sample.h
@@ -73,7 +73,7 @@ public:
virtual float get_playback_position() const override;
virtual void seek(float p_time) override;
- virtual void mix(AudioFrame *p_buffer, float p_rate_scale, int p_frames) override;
+ virtual int mix(AudioFrame *p_buffer, float p_rate_scale, int p_frames) override;
AudioStreamPlaybackSample();
};