diff options
| author | Albert Lee <trisk+xine@acm.jhu.edu> | 2007-06-13 23:32:51 +0200 |
|---|---|---|
| committer | Albert Lee <trisk+xine@acm.jhu.edu> | 2007-06-13 23:32:51 +0200 |
| commit | ca05584e624e78abfb5845daf298f973639b2a18 (patch) | |
| tree | 2b523e4191197601a3dd39f2aa439bfbcb15c6e4 | |
| parent | b5de10c039578f1b02c8163924a5330d53728494 (diff) | |
| download | xine-lib-ca05584e624e78abfb5845daf298f973639b2a18.tar.gz xine-lib-ca05584e624e78abfb5845daf298f973639b2a18.tar.bz2 | |
Avoid name collision (don't redefine NOPID).
| -rw-r--r-- | src/input/input_dvb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c index 736b4c6d7..98b343b44 100644 --- a/src/input/input_dvb.c +++ b/src/input/input_dvb.c @@ -115,7 +115,7 @@ #define BUFSIZE 16384 -#define NOPID 0xffff +#define DVB_NOPID 0xffff /* define stream types * administrative/system PIDs first */ @@ -657,7 +657,7 @@ static int dvb_set_pidfilter(dvb_input_plugin_t * this, int filter, ushort pid, { tuner_t *tuner = this->tuner; - if(this->channels[this->channel].pid [filter] !=NOPID) { + if(this->channels[this->channel].pid [filter] !=DVB_NOPID) { ioctl(tuner->fd_pidfilter[filter], DMX_STOP); } @@ -680,7 +680,7 @@ static int dvb_set_sectfilter(dvb_input_plugin_t * this, int filter, ushort pid, { tuner_t *tuner = this->tuner; - if(this->channels[this->channel].pid [filter] !=NOPID) { + if(this->channels[this->channel].pid [filter] !=DVB_NOPID) { ioctl(tuner->fd_pidfilter[filter], DMX_STOP); } @@ -1148,7 +1148,7 @@ static void parse_pmt(dvb_input_plugin_t *this, const unsigned char *buf, int se * parsing the descriptor. */ if(has_subs <= MAX_SUBTITLES) { xprintf(this->stream->xine,XINE_VERBOSITY_LOG,"input_dvb: Adding SUBTITLES: PID 0x%04x\n", elementary_pid); - if(this->channels[this->channel].subpid [has_subs] !=NOPID) { + if(this->channels[this->channel].subpid [has_subs] !=DVB_NOPID) { ioctl(this->tuner->fd_subfilter[has_subs], DMX_STOP); } this->channels[this->channel].subpid [has_subs] = elementary_pid; @@ -3056,7 +3056,7 @@ static int dvb_plugin_open(input_plugin_t * this_gen) /* Clear all pids, the pmt will tell us which to use */ for (x = 0; x < MAX_FILTERS; x++){ - this->channels[this->channel].pid[x] = NOPID; + this->channels[this->channel].pid[x] = DVB_NOPID; } |