RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Support the range syntax (like dvd://2-5) also for dvdnav. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29892 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2009-11-11 09:03:39 +00:00
parent 977c12c628
commit 92ac5a8c20
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
parser-mpcmd.c
View File

@ -70,7 +70,7 @@ m_config_parse_mp_command_line(m_config_t *config, int argc, char **argv)
{ {
int i,j,start_title=-1,end_title=-1; int i,j,start_title=-1,end_title=-1;
char *opt,*splitpos=NULL; char *opt,*splitpos=NULL;
char entbuf[10]; char entbuf[15];
int no_more_opts = 0; int no_more_opts = 0;
int opt_exit = 0; // flag indicating whether mplayer should exit without playing anything int opt_exit = 0; // flag indicating whether mplayer should exit without playing anything
play_tree_t *last_parent, *last_entry = NULL, *root; play_tree_t *last_parent, *last_entry = NULL, *root;
@ -215,15 +215,17 @@ m_config_parse_mp_command_line(m_config_t *config, int argc, char **argv)
} }
else /* filename */ else /* filename */
{ {
int is_dvdnav = strstr(argv[i],"dvdnav://") != NULL;
play_tree_t* entry = play_tree_new(); play_tree_t* entry = play_tree_new();
mp_msg(MSGT_CFGPARSER, MSGL_DBG2,"Adding file %s\n",argv[i]); 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 required expand DVD filename entries like dvd://1-3 into component titles
if ( strstr(argv[i],"dvd://") != NULL ) if ( strstr(argv[i],"dvd://") != NULL || is_dvdnav)
{ {
splitpos=strstr(argv[i]+6,"-"); int offset = is_dvdnav ? 9 : 6;
splitpos=strstr(argv[i]+offset,"-");
if(splitpos != NULL) if(splitpos != NULL)
{ {
start_title=strtol(argv[i]+6,NULL,10); start_title=strtol(argv[i]+offset,NULL,10);
if (start_title<0) { //entries like dvd://-2 start title implied 1 if (start_title<0) { //entries like dvd://-2 start title implied 1
end_title=abs(start_title); end_title=abs(start_title);
start_title=1; start_title=1;
@ -237,7 +239,7 @@ m_config_parse_mp_command_line(m_config_t *config, int argc, char **argv)
{ {
if (j!=start_title) if (j!=start_title)
entry=play_tree_new(); entry=play_tree_new();
snprintf(entbuf,9,"dvd://%d",j); snprintf(entbuf,sizeof(entbuf),is_dvdnav ? "dvdnav://%d" : "dvd://%d",j);
play_tree_add_file(entry,entbuf); play_tree_add_file(entry,entbuf);
add_entry(&last_parent,&last_entry,entry); add_entry(&last_parent,&last_entry,entry);
last_entry = entry; last_entry = entry;