From a9bbaa5eb29cae310ca8efd4f8d197de406683f7 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 2 Jul 2015 14:08:22 +0200 Subject: player: remove automatic DVB channel advancement on no data For the sake of removing the separate stream/demuxer loading code. This could probably be reimplemented in some other way, but I have no DVB hardware for testing. The most preferred way would be making DVB to not quit, and just rerun the stream selection. --- player/loadfile.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/player/loadfile.c b/player/loadfile.c index 976e729287..f4ba0d4282 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -1195,12 +1195,6 @@ goto_reopen_demuxer: ; !mpctx->current_track[0][STREAM_AUDIO]) { MP_FATAL(mpctx, "No video or audio streams selected.\n"); - struct demuxer *d = mpctx->demuxer; - if (d->stream->uncached_type == STREAMTYPE_DVB) { - int dir = mpctx->last_dvb_step; - if (demux_stream_control(d, STREAM_CTRL_DVB_STEP_CHANNEL, &dir) > 0) - mpctx->stop_play = PT_RELOAD_DEMUXER; - } mpctx->error_playing = MPV_ERROR_NOTHING_TO_PLAY; goto terminate_playback; } -- cgit v1.2.3