diff options
| author | Marcelo Fernandez <marcelofg55@gmail.com> | 2017-09-21 00:31:36 -0300 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-23 16:55:00 +0200 |
| commit | 46af050e93ddda77fd6316b0d041b8e9e6f0cd49 (patch) | |
| tree | e155e527741cfc132b82b52014967849d30b812f /modules/vorbis | |
| parent | 650e0cf3186df2239cbcb6c178533a09732f3f02 (diff) | |
Rename get_position => get_playback_position and seek_pos => seek on audio classes
Diffstat (limited to 'modules/vorbis')
| -rw-r--r-- | modules/vorbis/audio_stream_ogg_vorbis.cpp | 6 | ||||
| -rw-r--r-- | modules/vorbis/audio_stream_ogg_vorbis.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/modules/vorbis/audio_stream_ogg_vorbis.cpp b/modules/vorbis/audio_stream_ogg_vorbis.cpp index 52aa2c5ee0..0afb889199 100644 --- a/modules/vorbis/audio_stream_ogg_vorbis.cpp +++ b/modules/vorbis/audio_stream_ogg_vorbis.cpp @@ -180,7 +180,7 @@ void AudioStreamPlaybackOGGVorbis::play(float p_from) { frames_mixed = 0; playing = true; if (p_from > 0) { - seek_pos(p_from); + seek(p_from); } } @@ -203,7 +203,7 @@ void AudioStreamPlaybackOGGVorbis::stop() { //_clear(); } -float AudioStreamPlaybackOGGVorbis::get_position() const { +float AudioStreamPlaybackOGGVorbis::get_playback_position() const { int32_t frames = int32_t(frames_mixed); if (frames < 0) @@ -211,7 +211,7 @@ float AudioStreamPlaybackOGGVorbis::get_position() const { return double(frames) / stream_srate; } -void AudioStreamPlaybackOGGVorbis::seek_pos(float p_time) { +void AudioStreamPlaybackOGGVorbis::seek(float p_time) { if (!playing) return; diff --git a/modules/vorbis/audio_stream_ogg_vorbis.h b/modules/vorbis/audio_stream_ogg_vorbis.h index 9f1d78850d..929b2651e9 100644 --- a/modules/vorbis/audio_stream_ogg_vorbis.h +++ b/modules/vorbis/audio_stream_ogg_vorbis.h @@ -96,8 +96,8 @@ public: virtual int get_loop_count() const; - virtual float get_position() const; - virtual void seek_pos(float p_time); + virtual float get_playback_position() const; + virtual void seek(float p_time); virtual int get_channels() const { return stream_channels; } virtual int get_mix_rate() const { return stream_srate; } |