diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-12-16 22:33:35 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-12-16 22:33:35 -0300 |
| commit | d55f95e0d2a2f99a4130a33ad542c3682d0b92db (patch) | |
| tree | 5e413e2e81398254ac2e5d7421c5fd893ef537a7 /scene/resources/audio_stream_resampled.h | |
| parent | bcf27feb980aec593c7cb771984e46113cfad757 (diff) | |
| parent | 1664cd67101722f0955385ed6b463f534830aeed (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'scene/resources/audio_stream_resampled.h')
| -rw-r--r-- | scene/resources/audio_stream_resampled.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/resources/audio_stream_resampled.h b/scene/resources/audio_stream_resampled.h index f1e3629ac7..a1b95e81d5 100644 --- a/scene/resources/audio_stream_resampled.h +++ b/scene/resources/audio_stream_resampled.h @@ -57,7 +57,7 @@ class AudioStreamResampled : public AudioStream { template<int C> - void _resample(int32_t *p_dest,int p_todo,int32_t p_increment); + uint32_t _resample(int32_t *p_dest,int p_todo,int32_t p_increment); protected: @@ -97,7 +97,7 @@ protected: _FORCE_INLINE_ int16_t *get_write_buffer() { return read_buf; } _FORCE_INLINE_ void write(uint32_t p_frames) { - ERR_FAIL_COND(p_frames > rb_len); + ERR_FAIL_COND(p_frames >= rb_len); switch(channels) { case 1: { |