diff options
author | attila <attila@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-11-01 15:17:01 +0000 |
---|---|---|
committer | attila <attila@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-11-01 15:17:01 +0000 |
commit | 4b1211d2d0fa3bd4b9ed112acf528299b82ea962 (patch) | |
tree | 976dbcd01a54132ea2efd09c6a0baf6a0297c500 /mplayer.c | |
parent | 6ce8b10dd24d257ad609fff7e9919ff4d8e918e7 (diff) | |
download | mpv-4b1211d2d0fa3bd4b9ed112acf528299b82ea962.tar.bz2 mpv-4b1211d2d0fa3bd4b9ed112acf528299b82ea962.tar.xz |
Patch by Nico <nsabbi@libero.it>
this patch fixes a recently discovered bug for which DVB-C users
couldn't tune
(wrong parsing of the config file and incorrect parameter passing to
tune_it())
and includes the still unapplied patch posted in date 6/9/2003:
- it works correctly with and without caches; in the former case it
doesn't take anymore a lot of time to empty the cache before changing channel;
the uninit_cache() function is called in mplayer.c just after
the new tuning operation
- initialized a variable identifying the tuner type, and exit if it
isn't supported
- doesn't crash anymore when
1) the channels file doesn't exists
2) the tuner is used by another application
3) in the menu, when trying to select a channel before the first
4) some mp_msg() called in case of error
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11353 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -1372,6 +1372,7 @@ if(stream->type==STREAMTYPE_DVD){ #endif // CACHE2: initial prefill: 20% later: 5% (should be set by -cacheopts) +goto_enable_cache: if(stream_cache_size>0){ current_module="enable_cache"; if(!stream_enable_cache(stream,stream_cache_size*1024,stream_cache_size*1024/5,stream_cache_size*1024/20)) @@ -1379,9 +1380,6 @@ if(stream_cache_size>0){ } //============ Open DEMUXERS --- DETECT file type ======================= -#ifdef HAS_DVBIN_SUPPORT -goto_open_demuxer: -#endif current_module="demux_open"; demuxer=demux_open(stream,file_format,audio_id,video_id,dvdsub_id,filename); @@ -1568,7 +1566,8 @@ if(!sh_video && !sh_audio){ if(dvb_step_channel(priv, dir)) { uninit_player(INITED_ALL-(INITED_STREAM|INITED_INPUT)); - goto goto_open_demuxer; + cache_uninit(stream); + goto goto_enable_cache; } } } @@ -2933,8 +2932,8 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still) if(dvb_step_channel(priv, dir)) { uninit_player(INITED_ALL-(INITED_STREAM|INITED_INPUT)); - printf("UNINIT COMPLETE\n"); - goto goto_open_demuxer; + cache_uninit(stream); + goto goto_enable_cache; } } } @@ -2967,7 +2966,8 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still) if(dvb_set_channel(priv, cmd->args[0].v.i)) { uninit_player(INITED_ALL-(INITED_STREAM|INITED_INPUT)); - goto goto_open_demuxer; + cache_uninit(stream); + goto goto_enable_cache; } } } |