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

stream: use vlc_killed()

parent c881098b
...@@ -694,7 +694,7 @@ static void AStreamPrebufferBlock( stream_t *s ) ...@@ -694,7 +694,7 @@ static void AStreamPrebufferBlock( stream_t *s )
bool b_eof; bool b_eof;
block_t *b; block_t *b;
if( !vlc_object_alive(s) || p_sys->block.i_size > STREAM_CACHE_PREBUFFER_SIZE ) if( vlc_killed() || p_sys->block.i_size > STREAM_CACHE_PREBUFFER_SIZE )
{ {
int64_t i_byterate; int64_t i_byterate;
...@@ -1024,7 +1024,7 @@ static int AStreamRefillBlock( stream_t *s ) ...@@ -1024,7 +1024,7 @@ static int AStreamRefillBlock( stream_t *s )
{ {
bool b_eof; bool b_eof;
if( !vlc_object_alive(s) ) if( vlc_killed() )
return VLC_EGENERIC; return VLC_EGENERIC;
/* Fetch a block */ /* Fetch a block */
...@@ -1380,7 +1380,7 @@ static int AStreamRefillStream( stream_t *s ) ...@@ -1380,7 +1380,7 @@ static int AStreamRefillStream( stream_t *s )
int i_off = tk->i_end % STREAM_CACHE_TRACK_SIZE; int i_off = tk->i_end % STREAM_CACHE_TRACK_SIZE;
int i_read; int i_read;
if( !vlc_object_alive(s) ) if( vlc_killed() )
return VLC_EGENERIC; return VLC_EGENERIC;
i_read = __MIN( i_toread, STREAM_CACHE_TRACK_SIZE - i_off ); i_read = __MIN( i_toread, STREAM_CACHE_TRACK_SIZE - i_off );
...@@ -1441,7 +1441,7 @@ static void AStreamPrebufferStream( stream_t *s ) ...@@ -1441,7 +1441,7 @@ static void AStreamPrebufferStream( stream_t *s )
int i_read; int i_read;
int i_buffered = tk->i_end - tk->i_start; int i_buffered = tk->i_end - tk->i_start;
if( !vlc_object_alive(s) || i_buffered >= STREAM_CACHE_PREBUFFER_SIZE ) if( vlc_killed() || i_buffered >= STREAM_CACHE_PREBUFFER_SIZE )
{ {
int64_t i_byterate; int64_t i_byterate;
......
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