diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-20 13:22:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-20 13:22:47 +0200 |
| commit | 372cdc20705dab7c2227b89d8bc4d425ffd3e8a4 (patch) | |
| tree | a8811a50265edd940b00e12b9bd522e3e9b4694e /modules/opus/audio_stream_opus.cpp | |
| parent | ecd226c6a751f8a20766363fd1f2e1e0e2da8fba (diff) | |
| parent | 5ad9be4c24e9d7dc5672fdc42cea896622fe5685 (diff) | |
Merge pull request #11153 from letheed/rename-pos
Rename pos/rot/loc/scl
Diffstat (limited to 'modules/opus/audio_stream_opus.cpp')
| -rw-r--r-- | modules/opus/audio_stream_opus.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/opus/audio_stream_opus.cpp b/modules/opus/audio_stream_opus.cpp index 1dac890eb8..995f4ddcc6 100644 --- a/modules/opus/audio_stream_opus.cpp +++ b/modules/opus/audio_stream_opus.cpp @@ -56,7 +56,7 @@ int AudioStreamPlaybackOpus::_op_seek_func(void *_stream, opus_int64 _offset, in fa->seek(_offset); } break; case SEEK_CUR: { - fa->seek(fa->get_pos() + _offset); + fa->seek(fa->get_position() + _offset); } break; case SEEK_END: { fa->seek_end(_offset); @@ -83,7 +83,7 @@ int AudioStreamPlaybackOpus::_op_close_func(void *_stream) { opus_int64 AudioStreamPlaybackOpus::_op_tell_func(void *_stream) { FileAccess *_fa = (FileAccess *)_stream; - return (opus_int64)_fa->get_pos(); + return (opus_int64)_fa->get_position(); } void AudioStreamPlaybackOpus::_clear_stream() { @@ -340,7 +340,7 @@ float AudioStreamPlaybackOpus::get_length() const { return length; } -float AudioStreamPlaybackOpus::get_pos() const { +float AudioStreamPlaybackOpus::get_position() const { int32_t frames = int32_t(frames_mixed); if (frames < 0) |