Mercurial > mplayer.hg

changeset 24875:fe6dc73c7314

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed unused variables and parameters
author nicodvb
date Tue, 30 Oct 2007 22:30:15 +0000
parents e921187ddaaa
children d9afff01e632
files stream/dvb_tune.c stream/stream_dvb.c
diffstat 2 files changed, 7 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/stream/dvb_tune.c	Tue Oct 30 21:18:39 2007 +0000
+++ b/stream/dvb_tune.c	Tue Oct 30 22:30:15 2007 +0000
@@ -40,7 +40,6 @@
 	char* dvb_frontenddev[4]={"/dev/dvb/adapter0/frontend0","/dev/dvb/adapter1/frontend0","/dev/dvb/adapter2/frontend0","/dev/dvb/adapter3/frontend0"};
 	char* dvb_dvrdev[4]={"/dev/dvb/adapter0/dvr0","/dev/dvb/adapter1/dvr0","/dev/dvb/adapter2/dvr0","/dev/dvb/adapter3/dvr0"};
 	char* dvb_demuxdev[4]={"/dev/dvb/adapter0/demux0","/dev/dvb/adapter1/demux0","/dev/dvb/adapter2/demux0","/dev/dvb/adapter3/demux0"};
-//	static char* dvb_secdev[4]={"","","",""};	//UNUSED, ONLY FOR UNIFORMITY
 #else
 	#include <ost/dmx.h>
 	#include <ost/sec.h>
@@ -101,7 +100,7 @@
 
 int dvb_set_ts_filt(int fd, uint16_t pid, dmx_pes_type_t pestype);
 
-int dvb_open_devices(dvb_priv_t *priv, int n, int demux_cnt, int *pids)
+int dvb_open_devices(dvb_priv_t *priv, int n, int demux_cnt)
 {
 	int i;
 	
@@ -151,7 +150,7 @@
 }
 
 
-int dvb_fix_demuxes(dvb_priv_t *priv, int cnt, int *pids)
+int dvb_fix_demuxes(dvb_priv_t *priv, int cnt)
 {
 	int i;
 	
--- a/stream/stream_dvb.c	Tue Oct 30 21:18:39 2007 +0000
+++ b/stream/stream_dvb.c	Tue Oct 30 22:30:15 2007 +0000
@@ -116,8 +116,8 @@
 extern int dvb_set_ts_filt(int fd, uint16_t pid, dmx_pes_type_t pestype);
 extern int dvb_demux_stop(int fd);
 extern int dvb_get_tuner_type(int fd);
-int dvb_open_devices(dvb_priv_t *priv, int n, int demux_cnt, int *pids);
-int dvb_fix_demuxes(dvb_priv_t *priv, int cnt, int *pids);
+int dvb_open_devices(dvb_priv_t *priv, int n, int demux_cnt);
+int dvb_fix_demuxes(dvb_priv_t *priv, int cnt);
 
 extern int dvb_tune(dvb_priv_t *priv, int freq, char pol, int srate, int diseqc, int tone,
 		fe_spectral_inversion_t specInv, fe_modulation_t modulation, fe_guard_interval_t guardInterval,
@@ -504,7 +504,7 @@
 		if(priv->card != card)
 		{
 			dvbin_close(stream);
-			if(! dvb_open_devices(priv, devno, channel->pids_cnt, channel->pids))
+			if(! dvb_open_devices(priv, devno, channel->pids_cnt))
 			{
 				mp_msg(MSGT_DEMUX, MSGL_ERR, "DVB_SET_CHANNEL, COULDN'T OPEN DEVICES OF CARD: %d, EXIT\n", card);
 				return 0;
@@ -512,13 +512,13 @@
 		}
 		else	//close all demux_fds with pos > pids required for the new channel or open other demux_fds if we have too few
 		{	
-			if(! dvb_fix_demuxes(priv, channel->pids_cnt, channel->pids))
+			if(! dvb_fix_demuxes(priv, channel->pids_cnt))
 				return 0;
 		}
 	}
 	else
 	{
-		if(! dvb_open_devices(priv, devno, channel->pids_cnt, channel->pids))
+		if(! dvb_open_devices(priv, devno, channel->pids_cnt))
 		{
 			mp_msg(MSGT_DEMUX, MSGL_ERR, "DVB_SET_CHANNEL2, COULDN'T OPEN DEVICES OF CARD: %d, EXIT\n", card);
 			return 0;