[vlc-commits] commit: stream_filter/httplive.c: Rename NextSegment() to GetSegment() ( Jean-Paul Saman )

[git at videolan.org]

vlc | branch: master | Jean-Paul Saman <jean-paul.saman at m2x.nl> | Fri Dec 17 15:35:28 2010 +0100| [16591673eef2a15bf0d7f0f57c1192226594ec7e] | committer: Jean-Paul Saman 

stream_filter/httplive.c: Rename NextSegment() to GetSegment()

The function NextSegment() no longer resembles its name. It does not
get the next segment. It just gets the segment p_sys->segment from a
HLS stream (default p_sys->current).

Renamed the function GetSegment() to more resemble its usage.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=16591673eef2a15bf0d7f0f57c1192226594ec7e
---

 modules/stream_filter/httplive.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/stream_filter/httplive.c b/modules/stream_filter/httplive.c
index c0ca84a..1815d9e 100644
--- a/modules/stream_filter/httplive.c
+++ b/modules/stream_filter/httplive.c
@@ -1313,12 +1313,12 @@ static void Close(vlc_object_t *p_this)
 /****************************************************************************
  * Stream filters functions
  ****************************************************************************/
-static segment_t *NextSegment(stream_t *s)
+static segment_t *GetSegment(stream_t *s)
 {
     stream_sys_t *p_sys = s->p_sys;
     segment_t *segment = NULL;
 
-    /* Is the next segment of the current HLS stream ready? */
+    /* Is this segment of the current HLS stream ready? */
     hls_stream_t *hls = hls_Get(p_sys->hls_stream, p_sys->current);
     if (hls != NULL)
     {
@@ -1390,7 +1390,7 @@ static ssize_t hls_Read(stream_t *s, uint8_t *p_read, unsigned int i_read)
         /* Determine next segment to read. If this is a meta playlist and
          * bandwidth conditions changed, then the stream might have switched
          * to another bandwidth. */
-        segment_t *segment = NextSegment(s);
+        segment_t *segment = GetSegment(s);
         if (segment == NULL)
             break;
 
@@ -1472,7 +1472,7 @@ static int Peek(stream_t *s, const uint8_t **pp_peek, unsigned int i_peek)
     segment_t *segment;
 
 again:
-    segment = NextSegment(s);
+    segment = GetSegment(s);
     if (segment == NULL)
     {
         msg_Err(s, "segment should have been available");