[vlc-commits] Revert "stream_filter/httplive.c: signal download thread on successfull index reload (live streams)"

[Jean-Paul Saman]

vlc | branch: master | Jean-Paul Saman <jean-paul.saman at m2x.nl> | Mon Oct 10 14:49:21 2011 +0200| [4a234dbe85ac29e8f3525ecaf71a81ae147570d7] | committer: Jean-Paul Saman

Revert "stream_filter/httplive.c: signal download thread on successfull index reload (live streams)"

This reverts commit 176f95145a9abe736170f8e02ef94720dbf6d4d6.

Conflicts:

	modules/stream_filter/httplive.c

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

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

diff --git a/modules/stream_filter/httplive.c b/modules/stream_filter/httplive.c
index f33b146..4402e62 100644
--- a/modules/stream_filter/httplive.c
+++ b/modules/stream_filter/httplive.c
@@ -1090,21 +1090,9 @@ static int hls_ReloadPlaylist(stream_t *s)
             msg_Info(s, "new HLS stream appended (id=%d, bandwidth=%"PRIu64")",
                      hls_new->id, hls_new->bandwidth);
         }
-        else
-        {
-            if ((hls_UpdatePlaylist(s, hls_new, &hls_old) == VLC_SUCCESS) &&
-                    (s->p_sys->download.stream == n))
-            {
-                /* wake up download thread */
-                msg_Err(s, "WAKING UP DOWNLOAD THREAD");
-                vlc_mutex_lock(&s->p_sys->download.lock_wait);
-                vlc_cond_signal(&s->p_sys->download.wait);
-                vlc_mutex_unlock(&s->p_sys->download.lock_wait);
-            }
-            else
-                msg_Info(s, "failed updating HLS stream (id=%d, bandwidth=%"PRIu64")",
-                             hls_new->id, hls_new->bandwidth);
-        }
+        else if (hls_UpdatePlaylist(s, hls_new, &hls_old) != VLC_SUCCESS)
+            msg_Info(s, "failed updating HLS stream (id=%d, bandwidth=%"PRIu64")",
+                     hls_new->id, hls_new->bandwidth);
     }
     vlc_array_destroy(hls_streams);
     return VLC_SUCCESS;