From 5ad9be4c24e9d7dc5672fdc42cea896622fe5685 Mon Sep 17 00:00:00 2001
From: letheed <letheed@outlook.com>
Date: Sun, 10 Sep 2017 15:37:49 +0200
Subject: Rename pos to position in user facing methods and variables

Rename user facing methods and variables as well as the corresponding
C++ methods according to the folloming changes:

* pos -> position
* rot -> rotation
* loc -> location

C++ variables are left as is.
---
 modules/vorbis/audio_stream_ogg_vorbis.cpp | 6 +++---
 modules/vorbis/audio_stream_ogg_vorbis.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules/vorbis')

diff --git a/modules/vorbis/audio_stream_ogg_vorbis.cpp b/modules/vorbis/audio_stream_ogg_vorbis.cpp
index 6389c286c2..52aa2c5ee0 100644
--- a/modules/vorbis/audio_stream_ogg_vorbis.cpp
+++ b/modules/vorbis/audio_stream_ogg_vorbis.cpp
@@ -58,7 +58,7 @@ int AudioStreamPlaybackOGGVorbis::_ov_seek_func(void *_f, ogg_int64_t offs, int
 		fa->seek(offs);
 	} else if (whence == SEEK_CUR) {
 
-		fa->seek(fa->get_pos() + offs);
+		fa->seek(fa->get_position() + offs);
 	} else if (whence == SEEK_END) {
 
 		fa->seek_end(offs);
@@ -89,7 +89,7 @@ long AudioStreamPlaybackOGGVorbis::_ov_tell_func(void *_f) {
 	//printf("close %p\n",_f);
 
 	FileAccess *fa = (FileAccess *)_f;
-	return fa->get_pos();
+	return fa->get_position();
 }
 
 int AudioStreamPlaybackOGGVorbis::mix(int16_t *p_bufer, int p_frames) {
@@ -203,7 +203,7 @@ void AudioStreamPlaybackOGGVorbis::stop() {
 	//_clear();
 }
 
-float AudioStreamPlaybackOGGVorbis::get_pos() const {
+float AudioStreamPlaybackOGGVorbis::get_position() const {
 
 	int32_t frames = int32_t(frames_mixed);
 	if (frames < 0)
diff --git a/modules/vorbis/audio_stream_ogg_vorbis.h b/modules/vorbis/audio_stream_ogg_vorbis.h
index 03b3726b52..9f1d78850d 100644
--- a/modules/vorbis/audio_stream_ogg_vorbis.h
+++ b/modules/vorbis/audio_stream_ogg_vorbis.h
@@ -96,7 +96,7 @@ public:
 
 	virtual int get_loop_count() const;
 
-	virtual float get_pos() const;
+	virtual float get_position() const;
 	virtual void seek_pos(float p_time);
 
 	virtual int get_channels() const { return stream_channels; }
-- 
cgit v1.2.3