Replace xvdr with MRL_ID define in strings

1 files changed, 22 insertions, 20 deletions

diff --git a/xine_frontend_main.c b/xine_frontend_main.c
index 6df991bb..fe93742a 100644
--- a/xine_frontend_main.c
+++ b/xine_frontend_main.c
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: xine_frontend_main.c,v 1.44 2008-06-17 16:12:23 phintuka Exp $
+ * $Id: xine_frontend_main.c,v 1.45 2008-06-17 16:17:49 phintuka Exp $
  *
  */
 
@@ -405,7 +405,7 @@ int main(int argc, char *argv[])
   while ((c = getopt_long(argc, argv, short_options, long_options, NULL)) != -1) {
     switch (c) {
     default:
-    case 'H': printf("\nUsage: %s [options] [xvdr[+udp|+tcp|+rtp]:[//host[:port]]] \n"
+    case 'H': printf("\nUsage: %s [options] [" MRL_ID "[+udp|+tcp|+rtp]:[//host[:port]]] \n"
 		     "\nAvailable options:\n", exec_name);
               printf("%s", help_str);
 	      list_plugins(NULL, verbose_xine_log);
@@ -532,20 +532,20 @@ int main(int argc, char *argv[])
 
 #if 1
   /* backward compability */
-  if(mrl && ( !strncmp(mrl, "xvdr:tcp:", 9) ||
-	      !strncmp(mrl, "xvdr:udp:", 9) ||
-	      !strncmp(mrl, "xvdr:rtp:", 9) ||
-	      !strncmp(mrl, "xvdr:pipe:", 10)))
+  if(mrl && ( !strncmp(mrl, MRL_ID ":tcp:",  MRL_ID_LEN+5) ||
+	      !strncmp(mrl, MRL_ID ":udp:",  MRL_ID_LEN+5) ||
+	      !strncmp(mrl, MRL_ID ":rtp:",  MRL_ID_LEN+5) ||
+	      !strncmp(mrl, MRL_ID ":pipe:", MRL_ID_LEN+6)))
     mrl[5] = '+';
 #endif
 
   /* If server address not given, try to find server automatically */
-  if(!mrl || 
-     !strcmp(mrl, "xvdr:") ||
-     !strcmp(mrl, "xvdr+tcp:") ||
-     !strcmp(mrl, "xvdr+udp:") ||
-     !strcmp(mrl, "xvdr+rtp:") ||
-     !strcmp(mrl, "xvdr+pipe:")) {
+  if(!mrl ||
+     !strcmp(mrl, MRL_ID ":") ||
+     !strcmp(mrl, MRL_ID "+tcp:") ||
+     !strcmp(mrl, MRL_ID "+udp:") ||
+     !strcmp(mrl, MRL_ID "+rtp:") ||
+     !strcmp(mrl, MRL_ID "+pipe:")) {
     char address[1024] = "";
     int port = -1;
     PRINTF("VDR server not given, searching ...\n");
@@ -557,31 +557,33 @@ int main(int argc, char *argv[])
 	asprintf(&mrl, "%s//%s:%d", tmp, address, port);
 	free(tmp);
       } else
-	asprintf(&mrl, "xvdr://%s:%d", address, port);
+	asprintf(&mrl, MRL_ID "://%s:%d", address, port);
     } else {
       PRINTF("---------------------------------------------------------------\n"
 	     "WARNING: MRL not given and server not found from local network.\n"
 	     "         Trying to connect to default port on local host.\n"
 	     "---------------------------------------------------------------\n");
-      mrl = strdup("xvdr://127.0.0.1");
+      mrl = strdup(MRL_ID "://127.0.0.1");
     }
   }
 
-  if(mrl && strncmp(mrl, "xvdr:", 5) && strncmp(mrl, "xvdr+", 5)) {
+  if(mrl && 
+     strncmp(mrl, MRL_ID ":", MRL_ID_LEN+1) && 
+     strncmp(mrl, MRL_ID "+", MRL_ID_LEN+1)) {
     char *mrl2 = mrl;
-    PRINTF("WARNING: MRL does not start with \'xvdr:\' (%s)", mrl);
-    asprintf(&mrl, "xvdr://%s", mrl);
+    PRINTF("WARNING: MRL does not start with \'" MRL_ID ":\' (%s)", mrl);
+    asprintf(&mrl, MRL_ID "://%s", mrl);
     free(mrl2);
   }
 
   {
     char *tmp = NULL, *mrl2 = mrl;
     if(frtp && !strstr(mrl, "rtp:"))
-      tmp = strdup("xvdr+rtp:");
+      tmp = strdup(MRL_ID "+rtp:");
     else if(fudp && !strstr(mrl, "udp:"))
-      tmp = strdup("xvdr+udp:");
+      tmp = strdup(MRL_ID "+udp:");
     else if(ftcp && !strstr(mrl, "tcp:"))
-      tmp = strdup("xvdr+tcp:");
+      tmp = strdup(MRL_ID "+tcp:");
     if(tmp) {
       mrl = strcatrealloc(tmp, strchr(mrl, '/'));
       free(mrl2);