[vlc-commits] commit: stream_filter/httplive.c: cleanup hls_Thread() (Jean-Paul Saman )

[git at videolan.org]

vlc | branch: master | Jean-Paul Saman <jean-paul.saman at m2x.nl> | Fri Dec 31 16:42:22 2010 +0100| [5eb8777f896104264b0d6ca5d3e7ca34bd24bc2e] | committer: Jean-Paul Saman 

stream_filter/httplive.c: cleanup hls_Thread()

Cleanup hls_Thread().

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

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

diff --git a/modules/stream_filter/httplive.c b/modules/stream_filter/httplive.c
index fbe4833..e3cc443 100644
--- a/modules/stream_filter/httplive.c
+++ b/modules/stream_filter/httplive.c
@@ -1192,8 +1192,7 @@ static int Download(stream_t *s, hls_stream_t *hls, segment_t *segment, int *cur
 
 static void* hls_Thread(vlc_object_t *p_this)
 {
-    hls_thread_t *client = (hls_thread_t *) p_this;
-    stream_t *s = client->s;
+    stream_t *s = ((hls_thread_t*)p_this)->s;
     stream_sys_t *p_sys = s->p_sys;
 
     int canc = vlc_savecancel();
@@ -1241,7 +1240,7 @@ static void* hls_Thread(vlc_object_t *p_this)
             mtime_t now = mdate();
             if (now >= p_sys->playlist.wakeup)
             {
-                if (hls_ReloadPlaylist(client->s) != VLC_SUCCESS)
+                if (hls_ReloadPlaylist(s) != VLC_SUCCESS)
                 {
                     /* No change in playlist, then backoff */
                     p_sys->playlist.tries++;
@@ -1265,7 +1264,7 @@ static void* hls_Thread(vlc_object_t *p_this)
         assert(segment);
         vlc_mutex_unlock(&hls->lock);
 
-        if (Download(client->s, hls, segment, &p_sys->download.current) != VLC_SUCCESS)
+        if (Download(s, hls, segment, &p_sys->download.current) != VLC_SUCCESS)
         {
             if (!vlc_object_alive(p_this)) break;