Commit 4a234dbe authored by Jean-Paul Saman's avatar Jean-Paul Saman

Revert "stream_filter/httplive.c: signal download thread on successfull index...

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

This reverts commit 176f9514.

Conflicts:

	modules/stream_filter/httplive.c
parent 5d772b7e
...@@ -1090,22 +1090,10 @@ static int hls_ReloadPlaylist(stream_t *s) ...@@ -1090,22 +1090,10 @@ static int hls_ReloadPlaylist(stream_t *s)
msg_Info(s, "new HLS stream appended (id=%d, bandwidth=%"PRIu64")", msg_Info(s, "new HLS stream appended (id=%d, bandwidth=%"PRIu64")",
hls_new->id, hls_new->bandwidth); hls_new->id, hls_new->bandwidth);
} }
else else if (hls_UpdatePlaylist(s, hls_new, &hls_old) != VLC_SUCCESS)
{
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")", msg_Info(s, "failed updating HLS stream (id=%d, bandwidth=%"PRIu64")",
hls_new->id, hls_new->bandwidth); hls_new->id, hls_new->bandwidth);
} }
}
vlc_array_destroy(hls_streams); vlc_array_destroy(hls_streams);
return VLC_SUCCESS; return VLC_SUCCESS;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment