Mercurial > mplayer.hg

changeset 4787:1ee5574d67d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix automatic vobsub detection and make it silent.
author atmos4
date Thu, 21 Feb 2002 15:44:51 +0000
parents 71c3a45cf1fd
children d678ce495a75
files mplayer.c vobsub.c vobsub.h
diffstat 3 files changed, 18 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/mplayer.c	Thu Feb 21 14:34:52 2002 +0000
+++ b/mplayer.c	Thu Feb 21 15:44:51 2002 +0000
@@ -766,7 +766,7 @@
 
     current_module="vobsub";
     if (vobsub_name){
-      vo_vobsub=vobsub_open(vobsub_name);
+      vo_vobsub=vobsub_open(vobsub_name,1);
       if(vo_vobsub==NULL)
         mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,vobsub_name);
     }else if(sub_auto && filename && (strlen(filename)>=5)){
@@ -774,7 +774,7 @@
       char *buf = malloc((strlen(filename)-3) * sizeof(char));
       memset(buf,0,strlen(filename)-3); // make sure string is terminated
       strncpy(buf, filename, strlen(filename)-4); 
-      vo_vobsub=vobsub_open(buf);
+      vo_vobsub=vobsub_open(buf,0);
       free(buf);
     }
     if(vo_vobsub)
--- a/vobsub.c	Thu Feb 21 14:34:52 2002 +0000
+++ b/vobsub.c	Thu Feb 21 15:44:51 2002 +0000
@@ -589,7 +589,7 @@
 }
 
 void *
-vobsub_open(const char *const name)
+vobsub_open(const char *const name, const int force)
 {
     vobsub_t *vob = malloc(sizeof(vobsub_t));
     if (vob) {
@@ -605,9 +605,10 @@
 	    strcpy(buf, name);
 	    strcat(buf, ".ifo");
 	    fd = fopen(buf, "rb");
-	    if (fd == NULL)
-		perror("VobSub: Can't open IFO file");
-	    else {
+	    if (fd == NULL) {
+		if(force)
+                    perror("VobSub: Can't open IFO file");
+	    } else {
 		// parse IFO header
 		unsigned char block[0x800];
 		const char *const ifo_magic = "DVDVIDEO-VTS";
@@ -660,9 +661,12 @@
 	    strcpy(buf, name);
 	    strcat(buf, ".idx");
 	    fd = fopen(buf, "rb");
-	    if (fd == NULL)
-		perror("VobSub: Can't open IDX file");
-	    else {
+	    if (fd == NULL) {
+		if(force)
+                    perror("VobSub: Can't open IDX file");
+                else
+                    return NULL;
+	    } else {
 		while (vobsub_parse_one_line(vob, fd) >= 0)
 		    /* NOOP */ ;
 		fclose(fd);
@@ -672,9 +676,10 @@
 	    strcpy(buf, name);
 	    strcat(buf, ".sub");
 	    mpg = mpeg_open(buf);
-	    if (mpg == NULL)
-		perror("VobSub: Can't open SUB file");
-	    else {
+	    if (mpg == NULL) {
+                if(force)
+		    perror("VobSub: Can't open SUB file");
+	    } else {
 		long last_pts_diff = 0;
 		while (!mpeg_eof(mpg)) {
 		    off_t pos = mpeg_tell(mpg);
--- a/vobsub.h	Thu Feb 21 14:34:52 2002 +0000
+++ b/vobsub.h	Thu Feb 21 15:44:51 2002 +0000
@@ -1,7 +1,7 @@
 #ifndef MPLAYER_VOBSUB_H
 #define MPLAYER_VOBSUB_H
 
-extern void *vobsub_open(const char *subname);
+extern void *vobsub_open(const char *subname, const int force);
 extern void vobsub_process(void *vob, float pts);
 extern void vobsub_reset(void *vob);
 extern void vobsub_draw(void *vob, int dxs, int dys, void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride));