diff options
Diffstat (limited to 'stream/stream.c')
-rw-r--r-- | stream/stream.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/stream/stream.c b/stream/stream.c index 8b8a84760a..8570f0b125 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -245,13 +245,11 @@ int stream_fill_buffer(stream_t *s){ case STREAMTYPE_STREAM: #ifdef CONFIG_NETWORK if( s->streaming_ctrl!=NULL && s->streaming_ctrl->streaming_read ) { - len=s->streaming_ctrl->streaming_read(s->fd,s->buffer,STREAM_BUFFER_SIZE, s->streaming_ctrl);break; - } else { - len=read(s->fd,s->buffer,STREAM_BUFFER_SIZE);break; - } -#else - len=read(s->fd,s->buffer,STREAM_BUFFER_SIZE);break; + len=s->streaming_ctrl->streaming_read(s->fd,s->buffer,STREAM_BUFFER_SIZE, s->streaming_ctrl); + } else #endif + len=read(s->fd,s->buffer,STREAM_BUFFER_SIZE); + break; case STREAMTYPE_DS: len = demux_read_data((demux_stream_t*)s->priv,s->buffer,STREAM_BUFFER_SIZE); break; |