[xine-cvs] CVS: xine-lib/src/input input_dvb.c,1.20,1.21

[Michael R. <mr...@us...>]

Update of /cvsroot/xine/xine-lib/src/input
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28552/src/input

Modified Files:
	input_dvb.c 
Log Message:
some code cleanup, make MRL more consistent by allowing dvb:/<channel>
(old scheme kept for compatibility)


Index: input_dvb.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/input_dvb.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- input_dvb.c	14 Dec 2003 22:13:22 -0000	1.20
+++ input_dvb.c	12 Feb 2004 18:05:06 -0000	1.21
@@ -412,7 +412,7 @@
     return;
   }
 
- event.type = XINE_EVENT_PIDS_CHANGE;
+  event.type = XINE_EVENT_PIDS_CHANGE;
   data.vpid = this->channels[this->channel].vpid;
   data.apid = this->channels[this->channel].apid;
   event.data = &data;
@@ -434,7 +434,7 @@
   event.data_length = sizeof(ui_data);
   xine_event_send(this->stream, &event);
 
-  lprintf ("input_dvb: ui title event sent\n");
+  lprintf ("ui title event sent\n");
   
   this->fd = open (DVR_DEVICE, O_RDONLY);
 
@@ -895,8 +895,9 @@
   this->channels = channels;
   this->num_channels = num_channels;
 
-  if ( sscanf (this->mrl, "dvb://%d", &this->channel) != 1)
-    this->channel = 0;
+  if ( sscanf (this->mrl, "dvb:/%d", &this->channel) != 1)
+    if ( sscanf (this->mrl, "dvb://%d", &this->channel) != 1)
+      this->channel = 0;
 
   if (!tuner_set_channel (this->tuner, &this->channels[this->channel])) {
     xprintf (this->class->xine, XINE_VERBOSITY_LOG, _("input_dvb: tuner_set_channel failed\n"));