[Mplayer-cvslog] CVS: main playtreeparser.c,1.27,1.28
Roberto Togni CVS
syncmail at mplayerhq.hu
Sun Jun 6 21:06:41 CEST 2004
CVS change done by Roberto Togni CVS
Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv2848
Modified Files:
playtreeparser.c
Log Message:
Enhance detection of embedded smil playlist, add embedded ram playlist
support
Patch by adland
Index: playtreeparser.c
===================================================================
RCS file: /cvsroot/mplayer/main/playtreeparser.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- playtreeparser.c 26 Apr 2004 19:33:37 -0000 1.27
+++ playtreeparser.c 6 Jun 2004 19:06:39 -0000 1.28
@@ -558,13 +558,18 @@
if(line[0] == '\0')
continue;
- //Special check for smil reference in file
+ //Special check for embedded smil or ram reference in file
embedded = 0;
if (strlen(line) > 5)
for(c = line; c[0]; c++ )
- if((c[0] == '.') && (tolower(c[1]) == 's') && (tolower(c[2])== 'm') &&
+ if ( ((c[0] == '.') && //start with . and next have smil with optional ? or &
+ (tolower(c[1]) == 's') && (tolower(c[2])== 'm') &&
(tolower(c[3]) == 'i') && (tolower(c[4]) == 'l') &&
- (!c[5] || c[5] == '?' || c[5] == '&')) {
+ (!c[5] || c[5] == '?' || c[5] == '&')) || // or
+ ((c[0] == '.') && // start with . and next have smi or ram with optional ? or &
+ ( ((tolower(c[1]) == 's') && (tolower(c[2])== 'm') && (tolower(c[3]) == 'i')) ||
+ ((tolower(c[1]) == 'r') && (tolower(c[2])== 'a') && (tolower(c[3]) == 'm')) )
+ && (!c[4] || c[4] == '?' || c[4] == '&')) ){
entry=embedded_playlist_parse(line);
embedded = 1;
break;
More information about the MPlayer-cvslog
mailing list