Index: parser-mpcmd.c
===================================================================
RCS file: /cvsroot/mplayer/main/parser-mpcmd.c,v
retrieving revision 1.17
diff --unified -B -b -r1.17 parser-mpcmd.c
--- parser-mpcmd.c	14 Jul 2004 09:25:47 -0000	1.17
+++ parser-mpcmd.c	18 Oct 2004 23:58:13 -0000
@@ -196,41 +196,71 @@
       }
     else /* filename */
       {
-	play_tree_t* entry = play_tree_new();
+        play_tree_t* entry;
+        char * tail;
+        int start, end;
+        char buffer[0xf];
+
 	mp_msg(MSGT_CFGPARSER, MSGL_DBG2,"Adding file %s\n",argv[i]);
-        // if required expand DVD filename entries like dvd://1-3 into component titles
-        if ( strstr(argv[i],"dvd://") != NULL )
-	{
-             splitpos=strstr(argv[i]+6,"-");
-             if(splitpos != NULL)
-             {
-               start_title=strtol(argv[i]+6,NULL,10);
-	       if (start_title<0) { //entries like dvd://-2 start title implied 1
-		   end_title=abs(start_title);
-                   start_title=1;
-               } else {
-                   end_title=strtol(splitpos+1,NULL,10);
+
+#define DVD_PREFIX_LENGTH 6 // 'dvd://'
+#define DVD_TITLE_START 1
+#define DVD_TITLE_END 1
+
+        if ( strstr(argv[i],"dvd://") != NULL ) {
+
+            /*
+             * Forward unchanged argv[i] if in extended mode
+             * (has : or @ in it)
+             */
+            if(strchr(argv[i] + DVD_PREFIX_LENGTH,':') ||
+                    strchr(argv[i] + DVD_PREFIX_LENGTH,'@')) {
+                entry = play_tree_new();
+                play_tree_add_file(entry,argv[i]);
                }
+            else {
               
-               if (dvd_range(start_title) && dvd_range(end_title) && (start_title<end_title))      
-               {
-                 for (j=start_title;j<=end_title;j++)
-                 {
-                  if (j!=start_title) 
-                      entry=play_tree_new();
-                  snprintf(entbuf,9,"dvd://%d",j);
-                  play_tree_add_file(entry,entbuf);
+                /*
+                 * Now it can have the format dvd://1-2 or dvd://-3 or dvd://2
+                 */
+
+                tail = strdup(argv[i] + DVD_PREFIX_LENGTH); // remove dvd://
+                if(!strchr(tail,'-')) {
+                    start = strtol(tail, NULL, 0);
+                    end = start;
+                    tail = '\0';
+
+                }
+                else {
+                    start = strtol(strsep(&tail,"-"), NULL, 0); // temporary start-position
+
+                    end = abs(strtol(tail, NULL, 0)); // always end-position
+                }
+
+                if(tail != '\0')
+                    mp_msg(MSGT_CFGPARSER, MSGL_ERR, 
+                            "Extra information (%s) in argument '%s'\n",tail,argv[i]);
+                return 0;
+
+                if(start == 0) // if start has nothing defined
+                    start = DVD_TITLE_START;
+
+                if(dvd_range(start) && dvd_range(end) && (start <= end)) {
+                    for (j=start; j <= end; j++) {
+                        entry = play_tree_new();
+                        snprintf(buffer,0xe,"dvd://%d",j);
+                        play_tree_add_file(entry,buffer);
                   add_entry(&last_parent,&last_entry,entry);
 		  last_entry = entry;
                  }
-               } else {
+                }
+                else {
                  mp_msg(MSGT_CFGPARSER, MSGL_ERR,"Invalid play entry %s\n",argv[i]);
+                    return 0;
+                }
                }
-         
-	     } else { // dvd:// or dvd://x entry
-                play_tree_add_file(entry,argv[i]);
              }
-        } else {
+        else {
 	play_tree_add_file(entry,argv[i]);
 	}
 
Index: libmpdemux/open.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/open.c,v
retrieving revision 1.99
diff --unified -B -b -r1.99 open.c
--- libmpdemux/open.c	22 Aug 2004 18:47:48 -0000	1.99
+++ libmpdemux/open.c	18 Oct 2004 23:58:13 -0000
@@ -189,11 +190,41 @@
     ifo_handle_t *vmg_file;
     tt_srpt_t *tt_srpt;
     ifo_handle_t *vts_file;
-    dvd_title = filename[6] == '\0' ? 1 : strtol(filename + 6,NULL,0);
+
+    /**
+     * dvd://title:chapter-last_chapter:angle@dvd-device
+     * dvd://1:1-4:1@/dev/dvd
+     */
+    int boff = 6; // dvd://
+    char * pTail;
+    const char * dlim_main = ":";
+    const char * dlim_sub = "-";
+    char * main_t;
+    char * sub_t;
+
+    if(strchr(filename,'@')) 
+        dvd_device = strdup(strchr(filename,'@') + 1);
+    else 
+        dvd_device = strdup(DEFAULT_DVD_DEVICE);
+
+    pTail = (char *)strndup(filename + boff, strlen(filename) - strlen(dvd_device) - 1 - boff);
+    main_t = strsep(&pTail, dlim_main);
+    dvd_title = main_t == '\0' ? 1 : strtol(main_t, NULL, 0);
+
+    main_t = strsep(&pTail, dlim_main);
+    sub_t = strsep(&main_t, dlim_sub);
+    dvd_chapter = sub_t == '\0' ? 1 : strtol(sub_t, NULL, 0);
+
+    sub_t = strsep(&main_t, dlim_sub);
+    dvd_last_chapter = sub_t == '\0' ? 0 : strtol(sub_t, NULL, 0);
+
+    main_t = strsep(&pTail, dlim_main);
+    dvd_angle = main_t == '\0' ? 1 : strtol(main_t, NULL, 0);
+
+
     /**
      * Open the disc.
      */
-    if(!dvd_device) dvd_device=strdup(DEFAULT_DVD_DEVICE);
 #ifdef SYS_DARWIN
     /* Dynamic DVD drive selection on Darwin */
     if (!strcmp(dvd_device, "/dev/rdiskN")) {