From bcb6fa6d83a2e4a073fc15bdd49cb2d20d0f54b5 Mon Sep 17 00:00:00 2001
From: Miguel Freitas <miguelfreitas@users.sourceforge.net>
Date: Fri, 2 May 2003 15:02:11 +0000
Subject: require slash on mrl syntax. exception: file plugin can accept
 relative paths (see message on xine-devel)

CVS patchset: 4751
CVS date: 2003/05/02 15:02:11
---
 src/input/input_cdda.c       | 11 ++++-------
 src/input/input_pvr.c        |  6 +++---
 src/input/input_stdin_fifo.c |  4 ++--
 src/input/input_v4l.c        |  2 +-
 4 files changed, 10 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c
index c50ba8cd6..4de29e449 100644
--- a/src/input/input_cdda.c
+++ b/src/input/input_cdda.c
@@ -20,7 +20,7 @@
  * Compact Disc Digital Audio (CDDA) Input Plugin 
  *   by Mike Melanson (melanson@pcisys.net)
  *
- * $Id: input_cdda.c,v 1.16 2003/05/02 13:57:22 miguelfreitas Exp $
+ * $Id: input_cdda.c,v 1.17 2003/05/02 15:02:11 miguelfreitas Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -1355,7 +1355,7 @@ static char ** cdda_class_get_autoplay_list (input_class_t *this_gen,
   close(fd);
   
   for( i = 0; i <= toc.last_track - toc.first_track; i++ ) {
-    sprintf(trackmrl,"cdda:%d",i+toc.first_track);
+    sprintf(trackmrl,"cdda:/%d",i+toc.first_track);
     this->autoplaylist[i] = strdup(trackmrl);    
   }
 
@@ -1377,11 +1377,8 @@ static input_plugin_t *cdda_class_get_instance (input_class_t *cls_gen, xine_str
   printf("cdda_class_get_instance\n");
 #endif
   /* fetch the CD track to play */
-  if (!strncasecmp (mrl, "cdda:", 5)) {
-    if (mrl[5] != '/')
-      track = atoi(&mrl[5]);
-    else
-      track = atoi(&mrl[6]);
+  if (!strncasecmp (mrl, "cdda:/", 6)) {
+    track = atoi(&mrl[6]);
     /* CD tracks start at 1, reject illegal tracks */
     if (track <= 0)
       return NULL;
diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c
index 349a1a2d9..d0e7f27f8 100644
--- a/src/input/input_pvr.c
+++ b/src/input/input_pvr.c
@@ -39,7 +39,7 @@
  * usage: 
  *   xine pvr:<prefix_to_tmp_files>\!<prefix_to_saved_files>\!<max_page_age>
  *
- * $Id: input_pvr.c,v 1.16 2003/04/26 22:34:32 guenter Exp $
+ * $Id: input_pvr.c,v 1.17 2003/05/02 15:02:11 miguelfreitas Exp $
  */
 
 /**************************************************************************
@@ -1297,9 +1297,9 @@ static input_plugin_t *pvr_class_get_instance (input_class_t *cls_gen, xine_stre
   char                *mrl = strdup(data);
   char                *aux;
   
-  if (strncasecmp (mrl, "pvr:", 4)) 
+  if (strncasecmp (mrl, "pvr:/", 5)) 
     return NULL;
-  aux = &mrl[4];
+  aux = &mrl[5];
 
   this = (pvr_input_plugin_t *) xine_xmalloc (sizeof (pvr_input_plugin_t));
   this->class        = cls;
diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c
index 4a9cc8abd..7c72113a9 100644
--- a/src/input/input_stdin_fifo.c
+++ b/src/input/input_stdin_fifo.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: input_stdin_fifo.c,v 1.50 2003/04/26 22:34:32 guenter Exp $
+ * $Id: input_stdin_fifo.c,v 1.51 2003/05/02 15:02:11 miguelfreitas Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -296,7 +296,7 @@ static input_plugin_t *stdin_class_get_instance (input_class_t *cls_gen, xine_st
 
     fh = STDIN_FILENO;
 
-  } else if (!strncasecmp (mrl, "fifo:", 5)) {
+  } else if (!strncasecmp (mrl, "fifo:/", 6)) {
     char *filename;
 
     filename = (char *) &mrl[5];
diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c
index 3f07815e8..f45a1a7da 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -486,7 +486,7 @@ static input_plugin_t *v4l_class_get_instance (input_class_t *cls_gen,
   v4l_input_plugin_t *this;
   char               *mrl = strdup(data);
 
-  if (strncasecmp (mrl, "v4l:", 4)) {
+  if (strncasecmp (mrl, "v4l:/", 5)) {
     free (mrl);
     return NULL;
   }
-- 
cgit v1.2.3