diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2021-10-11 19:28:34 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-11 19:28:34 -0300 |
| commit | f9aec342dcd51d65c5970dd395e3c7a66cac446c (patch) | |
| tree | 9d5b542652e576f865abf0c97a37ee272210ae2e /scene/resources/audio_stream_sample.cpp | |
| parent | 9ed4f8367b29204b89f9feaf86727b24396fb180 (diff) | |
| parent | 610de0974db4feb7e50c9349a8a164b6bf0f36c8 (diff) | |
| download | redot-engine-f9aec342dcd51d65c5970dd395e3c7a66cac446c.tar.gz | |
Merge pull request #53687 from godotengine/revert-48332-implement-ping-pong
Revert "Implement reverse playback and ping-pong loop in AnimationPlayer and NodeAnimation"
Diffstat (limited to 'scene/resources/audio_stream_sample.cpp')
| -rw-r--r-- | scene/resources/audio_stream_sample.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/resources/audio_stream_sample.cpp b/scene/resources/audio_stream_sample.cpp index c8a10e1c2a..d018103e64 100644 --- a/scene/resources/audio_stream_sample.cpp +++ b/scene/resources/audio_stream_sample.cpp @@ -299,7 +299,7 @@ int AudioStreamPlaybackSample::mix(AudioFrame *p_buffer, float p_rate_scale, int if (loop_format != AudioStreamSample::LOOP_DISABLED && offset < loop_begin_fp) { /* loopstart reached */ - if (loop_format == AudioStreamSample::LOOP_PINGPONG) { + if (loop_format == AudioStreamSample::LOOP_PING_PONG) { /* bounce ping pong */ offset = loop_begin_fp + (loop_begin_fp - offset); increment = -increment; @@ -320,7 +320,7 @@ int AudioStreamPlaybackSample::mix(AudioFrame *p_buffer, float p_rate_scale, int if (loop_format != AudioStreamSample::LOOP_DISABLED && offset >= loop_end_fp) { /* loopend reached */ - if (loop_format == AudioStreamSample::LOOP_PINGPONG) { + if (loop_format == AudioStreamSample::LOOP_PING_PONG) { /* bounce ping pong */ offset = loop_end_fp - (offset - loop_end_fp); increment = -increment; @@ -650,7 +650,7 @@ void AudioStreamSample::_bind_methods() { BIND_ENUM_CONSTANT(LOOP_DISABLED); BIND_ENUM_CONSTANT(LOOP_FORWARD); - BIND_ENUM_CONSTANT(LOOP_PINGPONG); + BIND_ENUM_CONSTANT(LOOP_PING_PONG); BIND_ENUM_CONSTANT(LOOP_BACKWARD); } |