From 9fd15a6bb66fbdc762ef385d0cdf72d39cb73367 Mon Sep 17 00:00:00 2001
From: Rocky Bernstein <rockyb@users.sourceforge.net>
Date: Sun, 19 Oct 2003 23:48:47 +0000
Subject: vcd,ovcd -> vcdo. In MRL and plugin name.  In the past, the mpeg
 demux expected the mrl to *start* with vcd (not end with vcd).

CVS patchset: 5552
CVS date: 2003/10/19 23:48:47
---
 src/input/Makefile.am |  8 ++++----
 src/input/input_vcd.c | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index 6a35b3c1f..2db1621f6 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -21,7 +21,7 @@ in_dvd = xineplug_inp_dvd.la
 ## build both vcd for now
 ##if ENABLE_VCDX
 ##else
-in_vcd = xineplug_inp_vcd.la
+in_vcd = xineplug_inp_vcdo.la
 ##endif
 #in_cda = xineplug_inp_cda.la
 endif
@@ -80,9 +80,9 @@ xineplug_inp_mms_la_SOURCES = input_mms.c net_buf_ctrl.c mms.c mmsh.c
 xineplug_inp_mms_la_LIBADD = $(XINE_LIB) @LIBICONV@
 xineplug_inp_mms_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
-xineplug_inp_vcd_la_SOURCES = input_vcd.c media_helper.c
-xineplug_inp_vcd_la_LIBADD = $(XINE_LIB)
-xineplug_inp_vcd_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
+xineplug_inp_vcdo_la_SOURCES = input_vcd.c media_helper.c
+xineplug_inp_vcdo_la_LIBADD = $(XINE_LIB)
+xineplug_inp_vcdo_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 xineplug_inp_stdin_fifo_la_SOURCES = input_stdin_fifo.c net_buf_ctrl.c
 xineplug_inp_stdin_fifo_la_LIBADD = $(XINE_LIB)
diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c
index 751ddd7f7..f63c5ba09 100644
--- a/src/input/input_vcd.c
+++ b/src/input/input_vcd.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_vcd.c,v 1.68 2003/10/19 14:34:35 siggi Exp $
+ * $Id: input_vcd.c,v 1.69 2003/10/19 23:48:47 rockyb Exp $
  *
  */
 
@@ -837,7 +837,7 @@ static int vcd_plugin_open (input_plugin_t *this_gen) {
   while (*filename == '/') filename++;
 
   if (sscanf (filename, "%d", &this->cur_track) != 1) {
-    printf ("input_vcd: malformed MRL. Use ovcd:/<track #>\n");
+    printf ("input_vcd: malformed MRL. Use vcdo:/<track #>\n");
     return 0;
   }
 
@@ -876,7 +876,7 @@ static input_plugin_t *vcd_class_get_instance (input_class_t *cls_gen, xine_stre
   vcd_input_plugin_t *this;
   char               *mrl = strdup(data);
 
-  if (strncasecmp (mrl, "ovcd:/",6)) {
+  if (strncasecmp (mrl, "vcdo:/",6)) {
     free (mrl);
     return 0;
   }
@@ -913,7 +913,7 @@ static char *vcd_class_get_description (input_class_t *this_gen) {
 }
 
 static char *vcd_class_get_identifier (input_class_t *this_gen) {
-  return "ovcd";
+  return "vcdo";
 }
 
 static void vcd_class_dispose (input_class_t *this_gen) {
@@ -973,7 +973,7 @@ static xine_mrl_t **vcd_class_get_dir (input_class_t *this_gen, const char *file
     char mrl[1024];
     
     memset(&mrl, 0, sizeof (mrl));
-    sprintf(mrl, "ovcd:/%d",i);
+    sprintf(mrl, "vcdo:/%d",i);
     
     if((i-1) >= this->mrls_allocated_entries) {
       ++this->mrls_allocated_entries;
@@ -1050,7 +1050,7 @@ static char ** vcd_class_get_autoplay_list (input_class_t *this_gen, int *num_fi
     if(this->filelist[i - 1] == NULL)
       this->filelist[i - 1] = (char *) realloc(this->filelist[i - 1], sizeof(char *) * 256);
 
-    sprintf (this->filelist[i - 1], "ovcd:/%d",i);
+    sprintf (this->filelist[i - 1], "vcdo:/%d",i);
     /* printf ("list[%d] : %d %s\n", i, this->filelist[i-1], this->filelist[i-1]);   */
   }
 
@@ -1098,6 +1098,6 @@ static void *init_class (xine_t *xine, void *data) {
 
 plugin_info_t xine_plugin_info[] = {
   /* type, API, "name", version, special_info, init_function */  
-  { PLUGIN_INPUT, 13, "OVCD", XINE_VERSION_CODE, NULL, init_class },
+  { PLUGIN_INPUT, 13, "VCDO", XINE_VERSION_CODE, NULL, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
-- 
cgit v1.2.3