From cd8540ab8cdc8cb314c7ca3ac9107b65577e0fcf Mon Sep 17 00:00:00 2001 From: arpi Date: Sun, 8 Sep 2002 23:00:01 +0000 Subject: removed messy global 'tv_handle', use stream->priv for that purpose note: i couldn't test it (only compile test) may be broken :( we're going to an unified demuxer API - required for modularization git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7330 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mplayer.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'mplayer.c') diff --git a/mplayer.c b/mplayer.c index 9aec93c5fa..492c002b8f 100644 --- a/mplayer.c +++ b/mplayer.c @@ -82,7 +82,7 @@ int quiet=0; #include "libmpdemux/tv.h" extern int tv_param_on; -extern tvi_handle_t *tv_handler; +//extern tvi_handle_t *tv_handler; #endif //**************************************************************************// @@ -2220,18 +2220,18 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still) if (tv_param_on == 1) { int v = cmd->args[0].v.i; if(v > 0) - tv_step_channel(tv_handler, TV_CHANNEL_HIGHER); + tv_step_channel((tvi_handle_t*)(stream->priv), TV_CHANNEL_HIGHER); else - tv_step_channel(tv_handler, TV_CHANNEL_LOWER); + tv_step_channel((tvi_handle_t*)(stream->priv), TV_CHANNEL_LOWER); } } break; case MP_CMD_TV_STEP_NORM : { if (tv_param_on == 1) - tv_step_norm(tv_handler); + tv_step_norm((tvi_handle_t*)(stream->priv)); } break; case MP_CMD_TV_STEP_CHANNEL_LIST : { if (tv_param_on == 1) - tv_step_chanlist(tv_handler); + tv_step_chanlist((tvi_handle_t*)(stream->priv)); } break; #endif case MP_CMD_VO_FULLSCREEN: -- cgit v1.2.3