Mercurial > mplayer.hg
comparison mplayer.c @ 2647:679d3b21bedb
-playlist option patch by Panagiotis Issaris <takis@lumumba.luc.ac.be>
author | arpi |
---|---|
date | Sat, 03 Nov 2001 02:55:03 +0000 |
parents | ea6158be8103 |
children | 013e84f44cf5 |
comparison
equal
deleted
inserted
replaced
2646:bbda31b5433b | 2647:679d3b21bedb |
---|---|
206 static int flip=-1; | 206 static int flip=-1; |
207 static int screen_size_x=0;//SCREEN_SIZE_X; | 207 static int screen_size_x=0;//SCREEN_SIZE_X; |
208 static int screen_size_y=0;//SCREEN_SIZE_Y; | 208 static int screen_size_y=0;//SCREEN_SIZE_Y; |
209 static int screen_size_xy=0; | 209 static int screen_size_xy=0; |
210 static float movie_aspect=0.0; | 210 static float movie_aspect=0.0; |
211 | |
212 char* playlist_file; | |
211 | 213 |
212 // sub: | 214 // sub: |
213 char *font_name=NULL; | 215 char *font_name=NULL; |
214 float font_factor=0.75; | 216 float font_factor=0.75; |
215 char *sub_name=NULL; | 217 char *sub_name=NULL; |
421 (strrchr(argv[0],'/') && !strcmp(strrchr(argv[0],'/'),"/gmplayer") ) ) | 423 (strrchr(argv[0],'/') && !strcmp(strrchr(argv[0],'/'),"/gmplayer") ) ) |
422 use_gui=1; | 424 use_gui=1; |
423 | 425 |
424 parse_cfgfiles(); | 426 parse_cfgfiles(); |
425 num_filenames=parse_command_line(conf, argc, argv, envp, &filenames); | 427 num_filenames=parse_command_line(conf, argc, argv, envp, &filenames); |
428 | |
429 if(playlist_file!=NULL) | |
430 { | |
431 FILE *playlist_f; | |
432 char *playlist_linebuffer = (char*)malloc(256); | |
433 char *playlist_line; | |
434 if(!strcmp(playlist_file,"-")) | |
435 { | |
436 playlist_f = fopen("/dev/stdin","r"); | |
437 } | |
438 else | |
439 playlist_f = fopen(playlist_file,"r"); | |
440 if(playlist_f != NULL) | |
441 { | |
442 while(!feof(playlist_f)) | |
443 { | |
444 memset(playlist_linebuffer,0,255); | |
445 fgets(playlist_linebuffer,255,playlist_f); | |
446 if(strlen(playlist_linebuffer)==0) | |
447 break; | |
448 playlist_linebuffer[strlen(playlist_linebuffer)-1] = 0; | |
449 playlist_line = (char*)malloc(strlen(playlist_linebuffer)+1); | |
450 memset(playlist_line,0,strlen(playlist_linebuffer)+1); | |
451 strcpy(playlist_line,playlist_linebuffer); | |
452 if (!(filenames = (char **) realloc(filenames, sizeof(*filenames) * (num_filenames + 2)))) | |
453 exit(3); | |
454 filenames[num_filenames++] = playlist_line; | |
455 } | |
456 fclose(playlist_f); | |
457 } | |
458 } | |
459 | |
460 | |
426 if(num_filenames<0) exit(1); // error parsing cmdline | 461 if(num_filenames<0) exit(1); // error parsing cmdline |
427 | 462 |
428 #ifndef HAVE_NEW_GUI | 463 #ifndef HAVE_NEW_GUI |
429 if(use_gui){ | 464 if(use_gui){ |
430 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_NoGui); | 465 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_NoGui); |
1511 if(sh_audio) sh_audio->timer+=0.1; | 1546 if(sh_audio) sh_audio->timer+=0.1; |
1512 break; | 1547 break; |
1513 // quit | 1548 // quit |
1514 case KEY_ESC: // ESC | 1549 case KEY_ESC: // ESC |
1515 case 'q': exit_player(MSGTR_Exit_quit); | 1550 case 'q': exit_player(MSGTR_Exit_quit); |
1551 case '>': | |
1552 if(curr_filename>=num_filenames-1) | |
1553 break; | |
1516 case KEY_ENTER: // ESC | 1554 case KEY_ENTER: // ESC |
1517 eof=1; // jump to next file | 1555 eof=1; // jump to next file |
1556 break; | |
1557 case '<': | |
1558 if(curr_filename < 1) | |
1559 break; | |
1560 curr_filename-=2; | |
1561 eof=1; | |
1518 break; | 1562 break; |
1519 case 'g': grab_frames=2;break; | 1563 case 'g': grab_frames=2;break; |
1520 // pause | 1564 // pause |
1521 case 'p': | 1565 case 'p': |
1522 case ' ': | 1566 case ' ': |