- if( vlc_thread_create( s, "stream out", DStreamThread,
- VLC_THREAD_PRIORITY_INPUT, VLC_FALSE ) )
- {
- vlc_object_destroy( s );
- free( p_sys );
- return NULL;
- }
-
- return s;
-}
-
-void stream_DemuxSend( stream_t *s, block_t *p_block )
-{
- d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys;
- if( p_block ) block_FifoPut( p_sys->p_fifo, p_block );
-}
-
-void stream_DemuxDelete( stream_t *s )
-{
- d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys;
- block_t *p_empty;
-
- vlc_object_kill( s );
- if( p_sys->p_demux )
- vlc_object_kill( p_sys->p_demux );
- p_empty = block_New( s, 1 ); p_empty->i_buffer = 0;
- block_FifoPut( p_sys->p_fifo, p_empty );
- vlc_thread_join( s );
-
- if( p_sys->p_demux ) demux2_Delete( p_sys->p_demux );
- if( p_sys->p_block ) block_Release( p_sys->p_block );
-
- block_FifoRelease( p_sys->p_fifo );
- free( p_sys->psz_name );
- free( p_sys );
-
- vlc_object_destroy( s );
-}
-
-
-static int DStreamRead( stream_t *s, void *p_read, int i_read )
-{
- d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys;
- uint8_t *p_out = p_read;
- int i_out = 0;
-
- //msg_Dbg( s, "DStreamRead: wanted %d bytes", i_read );
-
- while( !s->b_die && !s->b_error && i_read )
- {
- block_t *p_block = p_sys->p_block;
- int i_copy;
-
- if( !p_block )
- {
- p_block = block_FifoGet( p_sys->p_fifo );
- if( !p_block ) s->b_error = 1;
- p_sys->p_block = p_block;
- }
-
- if( p_block && i_read )
- {
- i_copy = __MIN( i_read, p_block->i_buffer );
- if( p_out && i_copy ) memcpy( p_out, p_block->p_buffer, i_copy );
- i_read -= i_copy;
- i_out += i_copy;
- p_block->i_buffer -= i_copy;
- p_block->p_buffer += i_copy;
-
- if( !p_block->i_buffer )
- {
- block_Release( p_block );
- p_sys->p_block = NULL;
- }
- }
- }
-
- p_sys->i_pos += i_out;
- return i_out;
-}
-
-static int DStreamPeek( stream_t *s, const uint8_t **pp_peek, int i_peek )
-{
- d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys;
- block_t **pp_block = &p_sys->p_block;
- int i_out = 0;
- *pp_peek = 0;