RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

removed unused variables and parameters 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24903 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
nicodvb 2007-10-30 22:30:15 +00:00
parent 08e0319d59
commit 3d1e0439ea
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
stream/dvb_tune.c
View File

@ -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_get_tuner_type(int fe_fd)
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_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_fix_demuxes(dvb_priv_t *priv, int cnt)
{
int i;

10
stream/stream_dvb.c
View File

@ -116,8 +116,8 @@ m_option_t dvbin_opts_conf[] = {
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 @@ int dvb_set_channel(dvb_priv_t *priv, int card, int n)
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 @@ int dvb_set_channel(dvb_priv_t *priv, int card, int n)
}
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;