[vlc-commits] commit: stream_filter/httplive.c: only check p_sys->playlist. wakeup for live streams (Jean-Paul Saman )

[git at videolan.org]

vlc | branch: master | Jean-Paul Saman <jean-paul.saman at m2x.nl> | Fri Dec 31 16:20:13 2010 +0100| [1ca77e878d37cd54724f71f452f7313a1be10fe8] | committer: Jean-Paul Saman 

stream_filter/httplive.c: only check p_sys->playlist.wakeup for live streams

Check only for live streams the member p_sys->playlist.wakeup.

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

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

diff --git a/modules/stream_filter/httplive.c b/modules/stream_filter/httplive.c
index 27d027a..fbe4833 100644
--- a/modules/stream_filter/httplive.c
+++ b/modules/stream_filter/httplive.c
@@ -1216,9 +1216,10 @@ static void* hls_Thread(vlc_object_t *p_this)
             vlc_mutex_lock(&p_sys->download.lock_wait);
             while (((p_sys->download.segment - p_sys->playback.segment > 6) ||
                     (p_sys->download.segment >= count)) &&
-                   (p_sys->download.seek == -1) &&
-                   (mdate() < p_sys->playlist.wakeup))
+                   (p_sys->download.seek == -1))
             {
+                if (p_sys->b_live && (mdate() >= p_sys->playlist.wakeup))
+                    break;
                 vlc_cond_wait(&p_sys->download.wait, &p_sys->download.lock_wait);
                 if (!vlc_object_alive(p_this)) break;
             }