# HG changeset patch
# User nicodvb
# Date 1083014114 0
# Node ID 661a6e80030f7ed2209686e1eb588ae40ef1dea5
# Parent  e6c9f2cda7d97299465bead40e091157d67c8112
slave command dvb_set_channel now takes 2 arguments: channel card

diff -r e6c9f2cda7d9 -r 661a6e80030f input/input.c
--- a/input/input.c	Mon Apr 26 20:11:33 2004 +0000
+++ b/input/input.c	Mon Apr 26 21:15:14 2004 +0000
@@ -95,7 +95,7 @@
 #endif
   { MP_CMD_SUB_FORCED_ONLY, "forced_subs_only",  0, { {-1,{0}} } },
 #ifdef HAS_DVBIN_SUPPORT
-  { MP_CMD_DVB_SET_CHANNEL, "dvb_set_channel", 1, { { MP_CMD_ARG_INT, {0}}, {-1,{0}}  }},
+  { MP_CMD_DVB_SET_CHANNEL, "dvb_set_channel", 2, { {MP_CMD_ARG_INT,{0}}, {MP_CMD_ARG_INT,{0}}, {-1,{0}}}},
 #endif
   { MP_CMD_VO_FULLSCREEN, "vo_fullscreen", 0, { {-1,{0}} } },
   { MP_CMD_VO_ONTOP, "vo_ontop", 0, { {-1,{0}} } },
diff -r e6c9f2cda7d9 -r 661a6e80030f mplayer.c
--- a/mplayer.c	Mon Apr 26 20:11:33 2004 +0000
+++ b/mplayer.c	Mon Apr 26 21:15:14 2004 +0000
@@ -2967,7 +2967,7 @@
 		else
 		    last_dvb_step = -1;
 
-  		if(dvb_set_channel(priv, cmd->args[0].v.i))
+  		if(dvb_set_channel(priv, cmd->args[1].v.i, cmd->args[0].v.i))
 		{
 	  	  uninit_player(INITED_ALL-(INITED_STREAM|INITED_INPUT));
 		  cache_uninit(stream);