diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-08-11 00:02:46 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-08-11 00:02:46 +0000 |
| commit | d891bc11ccbe529beb532f44c0fc837d5dbb5f3f (patch) | |
| tree | 00d6baa4f49709d223730b991b0c179f27850301 /libmpdemux/stream.c | |
| parent | a3b1944cc63a540c05d9368ab05afc80f36da0d9 (diff) | |
| download | mpv-d891bc11ccbe529beb532f44c0fc837d5dbb5f3f.tar.bz2 mpv-d891bc11ccbe529beb532f44c0fc837d5dbb5f3f.tar.xz | |
this patch fixes
1) some bugs introduced in the tuner autodetection and in the channel-parsing functions,
3) retries reading when the mplayer/mencoder don't read fast enough (sooner it exited)
but especially
4) makes the stream compliant with the new, modular stream api (the one
currently in CVS is not and is totally unreachable).
[and maybe more, next time please include cvslog in patch! -- A'rpi]
patch by Nico <nsabbi@libero.it>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10561 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/stream.c')
| -rw-r--r-- | libmpdemux/stream.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/libmpdemux/stream.c b/libmpdemux/stream.c index 2dd11d27bc..13161a8c8e 100644 --- a/libmpdemux/stream.c +++ b/libmpdemux/stream.c @@ -58,6 +58,10 @@ extern stream_info_t stream_info_cdda; #ifdef MPLAYER_NETWORK extern stream_info_t stream_info_netstream; #endif +#ifdef HAS_DVBIN_SUPPORT +extern stream_info_t stream_info_dvb; +#endif + extern stream_info_t stream_info_null; extern stream_info_t stream_info_file; @@ -71,6 +75,10 @@ stream_info_t* auto_open_streams[] = { #ifdef MPLAYER_NETWORK &stream_info_netstream, #endif +#ifdef HAS_DVBIN_SUPPORT + &stream_info_dvb, +#endif + &stream_info_null, &stream_info_file, NULL @@ -207,13 +215,6 @@ int stream_fill_buffer(stream_t *s){ len = demux_read_data((demux_stream_t*)s->priv,s->buffer,STREAM_BUFFER_SIZE); break; -#ifdef HAS_DVBIN_SUPPORT - case STREAMTYPE_DVB: - len = dvb_streaming_read(s->fd, s->buffer, STREAM_BUFFER_SIZE, s->priv); - break; -#endif - - default: len= s->fill_buffer ? s->fill_buffer(s,s->buffer,STREAM_BUFFER_SIZE) : 0; @@ -416,11 +417,6 @@ void free_stream(stream_t *s){ smbc_close(s->fd); break; #endif -#ifdef HAS_DVBIN_SUPPORT - case STREAMTYPE_DVB: - dvbin_close(s->priv); - break; -#endif #ifdef USE_DVDREAD case STREAMTYPE_DVD: |