Commit 2a305595 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

smooth: remove/propagate constant value

From the downloader thread, b_close is always true.
parent 872a08d5
...@@ -639,7 +639,7 @@ void* sms_Thread( void *p_this ) ...@@ -639,7 +639,7 @@ void* sms_Thread( void *p_this )
} }
vlc_cond_signal( &p_sys->playback.wait ); vlc_cond_signal( &p_sys->playback.wait );
while( !p_sys->b_close ) for( ;; )
{ {
if ( !p_sys->b_live || !p_sys->download.lookahead_count ) if ( !p_sys->b_live || !p_sys->download.lookahead_count )
stream_Control( s, STREAM_GET_PTS_DELAY, &i_pts_delay ); stream_Control( s, STREAM_GET_PTS_DELAY, &i_pts_delay );
...@@ -650,14 +650,6 @@ void* sms_Thread( void *p_this ) ...@@ -650,14 +650,6 @@ void* sms_Thread( void *p_this )
i_pts_delay ) ) i_pts_delay ) )
{ {
vlc_cond_wait( &p_sys->download.wait, &p_sys->lock ); vlc_cond_wait( &p_sys->download.wait, &p_sys->lock );
if( p_sys->b_close )
break;
}
if( p_sys->b_close )
{
vlc_mutex_unlock( &p_sys->lock );
break;
} }
sms_stream_t *sms = next_download_stream( p_sys ); sms_stream_t *sms = next_download_stream( p_sys );
......
...@@ -558,7 +558,6 @@ static void Close( vlc_object_t *p_this ) ...@@ -558,7 +558,6 @@ static void Close( vlc_object_t *p_this )
stream_t *s = (stream_t*)p_this; stream_t *s = (stream_t*)p_this;
stream_sys_t *p_sys = s->p_sys; stream_sys_t *p_sys = s->p_sys;
p_sys->b_close = true;
vlc_cond_signal(&p_sys->download.wait); vlc_cond_signal(&p_sys->download.wait);
vlc_join( p_sys->download.thread, NULL ); vlc_join( p_sys->download.thread, NULL );
......
...@@ -136,7 +136,6 @@ struct stream_sys_t ...@@ -136,7 +136,6 @@ struct stream_sys_t
/* state */ /* state */
bool b_live; /* live stream? or vod? */ bool b_live; /* live stream? or vod? */
bool b_close; /* set by Close() */
}; };
#define SMS_GET_SELECTED_ST( cat ) \ #define SMS_GET_SELECTED_ST( cat ) \
......
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