[Mplayer-cvslog] CVS: main mplayer.c,1.563,1.564

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv21302

Modified Files:
	mplayer.c 
Log Message:
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


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.563
retrieving revision 1.564
diff -u -r1.563 -r1.564
--- mplayer.c	2 Sep 2002 22:19:44 -0000	1.563
+++ mplayer.c	8 Sep 2002 23:00:00 -0000	1.564
@@ -82,7 +82,7 @@
 #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 (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: