[xine-cvs] CVS: xine-lib/src/libsputext demux_sputext.c,1.31,1.32

[Michael R. <mr...@us...>]

Update of /cvsroot/xine/xine-lib/src/libsputext
In directory sc8-pr-cvs1:/tmp/cvs-serv7899

Modified Files:
	demux_sputext.c 
Log Message:
* patch by David Gómez to support linebreaking '|' in subview format
* fix compiler warnings


Index: demux_sputext.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libsputext/demux_sputext.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- demux_sputext.c	17 Dec 2003 13:41:05 -0000	1.31
+++ demux_sputext.c	24 Dec 2003 17:34:49 -0000	1.32
@@ -322,13 +322,14 @@
     
     p=q=line;
     for (current->lines=1; current->lines < SUB_MAX_TEXT; current->lines++) {
-      for (q=p,len=0; *p && *p!='\r' && *p!='\n' && strncasecmp(p,"[br]",4); p++,len++);
+      for (q=p,len=0; *p && *p!='\r' && *p!='\n' && *p!='|' && strncasecmp(p,"[br]",4); p++,len++);
       current->text[current->lines-1]=(char *)xine_xmalloc (len+1);
       if (!current->text[current->lines-1]) return ERR;
       strncpy (current->text[current->lines-1], q, len);
       current->text[current->lines-1][len]='\0';
       if (!*p || *p=='\r' || *p=='\n') break;
-      while (*p++!=']');
+      if (*p=='[') while (*p++!=']');
+      if (*p=='|') p++;
     }
     break;
   }
@@ -630,7 +631,7 @@
   return current;
 }
 
-subtitle_t *sub_read_line_jacobsub(demux_sputext_t *this, subtitle_t *current) {
+static subtitle_t *sub_read_line_jacobsub(demux_sputext_t *this, subtitle_t *current) {
     char line1[LINE_LEN], line2[LINE_LEN], directive[LINE_LEN], *p, *q;
     unsigned a1, a2, a3, a4, b1, b2, b3, b4, comment = 0;
     static unsigned jacoTimeres = 30;
@@ -828,7 +829,7 @@
     return current;
 }
 
-subtitle_t *sub_read_line_subviewer2(demux_sputext_t *this, subtitle_t *current) {
+static subtitle_t *sub_read_line_subviewer2(demux_sputext_t *this, subtitle_t *current) {
     char line[LINE_LEN+1];
     int a1,a2,a3,a4;
     char *p=NULL;