[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xine-devel
Subject:    [xine-devel] [bug+patch] don't break config entrys "subtitles.*" in
From:       Savin Alex <alexo.veto () gmail ! com>
Date:       2010-06-29 17:47:32
Message-ID: 201006292147.32218.alexo.veto () gmail ! com
[Download RAW message or body]

don't  break config entrys "subtitles.*" in MRL

(subtitles.separate.subtitle_size, subtitles.separate.vertical_offset, subtitles.separate.font, 
subtitles.separate.src_encoding, subtitles.separate.use_unscaled_osd, subtitles.separate.timeout, 
subtitles.separate.font_freetype, subtitles.separate.font_use_freetype, etc...)



diff -r 80a96a21a581 -r 40a8e16bcfd4 src/xine-engine/xine.c
--- a/src/xine-engine/xine.c	Tue May 25 23:15:25 2010 +0100
+++ b/src/xine-engine/xine.c	Tue Jun 29 18:10:13 2010 +0400
@@ -1147,13 +1147,17 @@
 	    stream->slave = NULL;
 	  }
 	  free(subtitle_mrl);
+	  continue;
+	} 
+	/* don't  break config entry subtitles.*   */
+	else if(*(stream_setup) == 's' && *(stream_setup+1) == '.'){ 
+	  stream_setup-=8;
 	} else {
 	  xprintf(stream->xine, XINE_VERBOSITY_LOG, _("xine: error while parsing mrl\n"));
 	  stream->err = XINE_ERROR_MALFORMED_MRL;
 	  stream->status = XINE_STATUS_IDLE;
 	  return 0;
 	}
-	continue;
       }
       {
         /* when we got here, the stream setup parameter must be a config entry */


-- 
Best regards, Александр
                        mailto:alexo.veto@gmail.com

["xine-lib-fix-reject-subs.patch" (text/x-patch)]

diff -r 80a96a21a581 -r 40a8e16bcfd4 src/xine-engine/xine.c
--- a/src/xine-engine/xine.c	Tue May 25 23:15:25 2010 +0100
+++ b/src/xine-engine/xine.c	Tue Jun 29 18:10:13 2010 +0400
@@ -1147,13 +1147,17 @@
 	    stream->slave = NULL;
 	  }
 	  free(subtitle_mrl);
+	  continue;
+	} 
+	/* don't  break config entry subtitles.*   */
+	else if(*(stream_setup) == 's' && *(stream_setup+1) == '.'){ 
+	  stream_setup-=8;
 	} else {
 	  xprintf(stream->xine, XINE_VERBOSITY_LOG, _("xine: error while parsing mrl\n"));
 	  stream->err = XINE_ERROR_MALFORMED_MRL;
 	  stream->status = XINE_STATUS_IDLE;
 	  return 0;
 	}
-	continue;
       }
       {
         /* when we got here, the stream setup parameter must be a config entry */


------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first

_______________________________________________
xine-devel mailing list
xine-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xine-devel


[prev in list] [next in list] [prev in thread] [next in thread]