]> git.sesse.net Git - vlc/commitdiff
Revert "stream_filter/httplive.c: signal download thread on successfull index reload...
authorJean-Paul Saman <jean-paul.saman@m2x.nl>
Mon, 10 Oct 2011 12:49:21 +0000 (14:49 +0200)
committerJean-Paul Saman <jean-paul.saman@m2x.nl>
Tue, 11 Oct 2011 08:03:47 +0000 (10:03 +0200)
This reverts commit 176f95145a9abe736170f8e02ef94720dbf6d4d6.

Conflicts:

modules/stream_filter/httplive.c

modules/stream_filter/httplive.c

index f33b1468f84984a856ec8da5f07e0b080363496d..4402e6265a506f45444b06cfb48b781a628f0f43 100644 (file)
@@ -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;