Rename next -> position in decoders.

12 files changed, 18 insertions, 18 deletions

diff --git a/src/lib/black_decoder.cc b/src/lib/black_decoder.cc
index ce79ba0d7..0b231edd3 100644
--- a/src/lib/black_decoder.cc
+++ b/src/lib/black_decoder.cc
@@ -60,7 +60,7 @@ BlackDecoder::video_length () const
 }
 
 Time
-BlackDecoder::next () const
+BlackDecoder::position () const
 {
 	return _next_video;
 }
diff --git a/src/lib/black_decoder.h b/src/lib/black_decoder.h
index 622489646..4591881a1 100644
--- a/src/lib/black_decoder.h
+++ b/src/lib/black_decoder.h
@@ -32,7 +32,7 @@ public:
 	void seek (Time);
 	void seek_back ();
 	void seek_forward ();
-	Time next () const;
+	Time position () const;
 	bool done () const;
 
 	/* VideoDecoder */
diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index b550bf5cb..391b9d19a 100644
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -70,7 +70,7 @@ public:
 	/** @return Approximate time of the next content that we will emit,
 	 *  expressed relative to the start of our source.
 	 */
-	virtual Time next () const = 0;
+	virtual Time position () const = 0;
 
 	virtual bool done () const = 0;
 
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 7ebb31084..36078a463 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -452,22 +452,22 @@ FFmpegDecoder::seek (Time t)
 void
 FFmpegDecoder::seek_back ()
 {
-	if (next() < (2.5 * TIME_HZ / video_frame_rate())) {
+	if (position() < (2.5 * TIME_HZ / video_frame_rate())) {
 		return;
 	}
 	
-	do_seek (next() - 2.5 * TIME_HZ / video_frame_rate(), true, true);
+	do_seek (position() - 2.5 * TIME_HZ / video_frame_rate(), true, true);
 	VideoDecoder::seek_back ();
 }
 
 void
 FFmpegDecoder::seek_forward ()
 {
-	if (next() >= (_ffmpeg_content->length() - 0.5 * TIME_HZ / video_frame_rate())) {
+	if (position() >= (_ffmpeg_content->length() - 0.5 * TIME_HZ / video_frame_rate())) {
 		return;
 	}
 	
-	do_seek (next() - 0.5 * TIME_HZ / video_frame_rate(), true, true);
+	do_seek (position() - 0.5 * TIME_HZ / video_frame_rate(), true, true);
 	VideoDecoder::seek_forward ();
 }
 
@@ -608,7 +608,7 @@ FFmpegDecoder::decode_video_packet ()
 }
 
 Time
-FFmpegDecoder::next () const
+FFmpegDecoder::position () const
 {
 	if (_decode_video && _decode_audio && _audio_codec_context) {
 		return min (_next_video, _next_audio);
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 3cfb54e09..94658f58b 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -68,7 +68,7 @@ public:
 	void seek (Time);
 	void seek_back ();
 	void seek_forward ();
-	Time next () const;
+	Time position () const;
 	bool done () const;
 
 	/* VideoDecoder */
diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc
index 7da0ed551..077d0174d 100644
--- a/src/lib/imagemagick_decoder.cc
+++ b/src/lib/imagemagick_decoder.cc
@@ -134,7 +134,7 @@ ImageMagickDecoder::seek_forward ()
 }
 
 Time
-ImageMagickDecoder::next () const
+ImageMagickDecoder::position () const
 {
 	return _next_video;
 }
diff --git a/src/lib/imagemagick_decoder.h b/src/lib/imagemagick_decoder.h
index 82c87876b..73858b58a 100644
--- a/src/lib/imagemagick_decoder.h
+++ b/src/lib/imagemagick_decoder.h
@@ -36,7 +36,7 @@ public:
 	void seek (Time);
 	void seek_back ();
 	void seek_forward ();
-	Time next () const;
+	Time position () const;
 	bool done () const;
 
 	/* VideoDecoder */
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 6d7c3cfbd..60686e781 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -97,7 +97,7 @@ Player::pass ()
 	for (list<shared_ptr<Piece> >::iterator i = _pieces.begin(); i != _pieces.end(); ++i) {
 		cout << "check " << (*i)->content->file()
 		     << " start=" << (*i)->content->start()
-		     << ", next=" << (*i)->decoder->next()
+		     << ", position=" << (*i)->decoder->position()
 		     << ", end=" << (*i)->content->end() << "\n";
 		
 		if ((*i)->decoder->done ()) {
@@ -108,7 +108,7 @@ Player::pass ()
 			continue;
 		}
 		
-		Time const t = (*i)->content->start() + (*i)->decoder->next();
+		Time const t = (*i)->content->start() + (*i)->decoder->position();
 		if (t < earliest_t) {
 			cout << "\t candidate; " << t << " " << (t / TIME_HZ) << ".\n";
 			earliest_t = t;
@@ -136,7 +136,7 @@ Player::pass ()
 	}
 	
 	earliest->decoder->pass ();
-	_position = earliest->content->start() + earliest->decoder->next ();
+	_position = earliest->content->start() + earliest->decoder->position ();
 	cout << "\tpassed to " << _position << " " << (_position / TIME_HZ) << "\n";
 
         return false;
diff --git a/src/lib/silence_decoder.cc b/src/lib/silence_decoder.cc
index c8aa5c632..0380117ce 100644
--- a/src/lib/silence_decoder.cc
+++ b/src/lib/silence_decoder.cc
@@ -74,7 +74,7 @@ SilenceDecoder::seek_forward ()
 }
 
 Time
-SilenceDecoder::next () const
+SilenceDecoder::position () const
 {
 	return _next_audio;
 }
diff --git a/src/lib/silence_decoder.h b/src/lib/silence_decoder.h
index d05376a14..a8a335d39 100644
--- a/src/lib/silence_decoder.h
+++ b/src/lib/silence_decoder.h
@@ -32,6 +32,6 @@ public:
 	void seek (Time);
 	void seek_back ();
 	void seek_forward ();
-	Time next () const;
+	Time position () const;
 	bool done () const;
 };
diff --git a/src/lib/sndfile_decoder.cc b/src/lib/sndfile_decoder.cc
index c12152e67..ff56f1062 100644
--- a/src/lib/sndfile_decoder.cc
+++ b/src/lib/sndfile_decoder.cc
@@ -113,7 +113,7 @@ SndfileDecoder::audio_frame_rate () const
 }
 
 Time
-SndfileDecoder::next () const
+SndfileDecoder::position () const
 {
 	return _next_audio;
 }
diff --git a/src/lib/sndfile_decoder.h b/src/lib/sndfile_decoder.h
index a5edc196c..e904340b3 100644
--- a/src/lib/sndfile_decoder.h
+++ b/src/lib/sndfile_decoder.h
@@ -33,7 +33,7 @@ public:
 	void seek (Time) {}
 	void seek_back () {}
 	void seek_forward () {}
-	Time next () const;
+	Time position () const;
 	bool done () const;
 
 	int audio_channels () const;