annotate playtreeparser.c @ 27319:09cf111f68b8

Revert to previous dependency checking behavior. Take included header files into account when generating dependency files. This has problems when header files are removed or renamed, but does not silently miscompile files.
author diego
date Sat, 26 Jul 2008 18:36:48 +0000
parents fba022abe464
children 26ab2d01157f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
18265
1a14fde7680d Doxygen Attack! - Chapter 3
albeu
parents: 16871
diff changeset
1
1a14fde7680d Doxygen Attack! - Chapter 3
albeu
parents: 16871
diff changeset
2 /// \file
1a14fde7680d Doxygen Attack! - Chapter 3
albeu
parents: 16871
diff changeset
3 /// \ingroup PlaytreeParser
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
4
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4043
diff changeset
5 #include "config.h"
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
6 #include <stdlib.h>
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
7 #include <stdio.h>
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
8 #include <string.h>
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4043
diff changeset
9 #ifdef MP_DEBUG
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
10 #include <assert.h>
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4043
diff changeset
11 #endif
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
12 #include <errno.h>
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
13 #include <sys/types.h>
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
14 #include <sys/stat.h>
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
15 #include <fcntl.h>
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
16 #include <unistd.h>
12300
95ea9f5f6f14 Fix embedded smil playlist detection if there are parameters on the url
rtognimp
parents: 12223
diff changeset
17 #include <ctype.h>
9749
58e5880f4788 Use new config headers
albeu
parents: 9301
diff changeset
18 #include "m_config.h"
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
19 #include "playtree.h"
4308
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
20 #include "playtreeparser.h"
19271
64d82a45a05d introduce new 'stream' directory for all stream layer related components and split them from libmpdemux
ben
parents: 18928
diff changeset
21 #include "stream/stream.h"
12223
e7c8200ffdc5 Respect -playlist for asx streams
rtognimp
parents: 12097
diff changeset
22 #include "libmpdemux/demuxer.h"
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
23 #include "mp_msg.h"
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
24
6662
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
25
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
26 extern play_tree_t*
4308
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
27 asx_parser_build_tree(char* buffer, int ref);
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
28
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
29 #define BUF_STEP 1024
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
30
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
31 #define WHITES " \n\r\t"
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
32
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
33 static void
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
34 strstrip(char* str) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
35 char* i;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
36
8907
e82149e697a7 bunkus: Another nice off-by-one :)
mosu
parents: 8897
diff changeset
37 if (str==NULL)
e82149e697a7 bunkus: Another nice off-by-one :)
mosu
parents: 8897
diff changeset
38 return;
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
39 for(i = str ; i[0] != '\0' && strchr(WHITES,i[0]) != NULL; i++)
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
40 /* NOTHING */;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
41 if(i[0] != '\0') {
8907
e82149e697a7 bunkus: Another nice off-by-one :)
mosu
parents: 8897
diff changeset
42 memmove(str,i,strlen(i) + 1);
e82149e697a7 bunkus: Another nice off-by-one :)
mosu
parents: 8897
diff changeset
43 for(i = str + strlen(str) - 1 ; strchr(WHITES,i[0]) != NULL; i--)
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
44 /* NOTHING */;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
45 i[1] = '\0';
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
46 } else
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
47 str[0] = '\0';
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
48 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
49
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
50 static char*
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
51 play_tree_parser_get_line(play_tree_parser_t* p) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
52 char *end,*line_end;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
53 int r,resize = 0;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
54
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
55 if(p->buffer == NULL) {
18869
682a16136d6c rm unnecesary void* casts - part 1
reynaldo
parents: 18265
diff changeset
56 p->buffer = malloc(BUF_STEP);
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
57 p->buffer_size = BUF_STEP;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
58 p->iter = p->buffer;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
59 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
60
5802
35f19046f809 Portability fix with realloc
albeu
parents: 5788
diff changeset
61 if(p->stream->eof && (p->buffer_end == 0 || p->iter[0] == '\0'))
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
62 return NULL;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
63
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
64 while(1) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
65
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
66 if(resize) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
67 r = p->iter - p->buffer;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
68 p->buffer = (char*)realloc(p->buffer,p->buffer_size+BUF_STEP);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
69 p->iter = p->buffer + r;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
70 p->buffer_size += BUF_STEP;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
71 resize = 0;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
72 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
73
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
74 if(p->buffer_size - p->buffer_end > 1 && ! p->stream->eof) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
75 r = stream_read(p->stream,p->buffer + p->buffer_end,p->buffer_size - p->buffer_end - 1);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
76 if(r > 0) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
77 p->buffer_end += r;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
78 p->buffer[p->buffer_end] = '\0';
22242
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
79 while(strlen(p->buffer + p->buffer_end - r) != r)
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
80 p->buffer[p->buffer_end - r + strlen(p->buffer + p->buffer_end - r)] = '\n';
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
81 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
82 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
83
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
84 end = strchr(p->iter,'\n');
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
85 if(!end) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
86 if(p->stream->eof) {
4857
f3f94fb55398 Small bugfix with getting playlist last line.
albeu
parents: 4782
diff changeset
87 end = p->buffer + p->buffer_end;
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
88 break;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
89 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
90 resize = 1;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
91 continue;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
92 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
93 break;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
94 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
95
25141
fba022abe464 100l in play_tree_parser_get_line, check that there actually is
reimar
parents: 24962
diff changeset
96 line_end = (end > p->iter && *(end-1) == '\r') ? end-1 : end;
5802
35f19046f809 Portability fix with realloc
albeu
parents: 5788
diff changeset
97 if(line_end - p->iter >= 0)
35f19046f809 Portability fix with realloc
albeu
parents: 5788
diff changeset
98 p->line = (char*)realloc(p->line,line_end - p->iter+1);
35f19046f809 Portability fix with realloc
albeu
parents: 5788
diff changeset
99 else
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
100 return NULL;
5802
35f19046f809 Portability fix with realloc
albeu
parents: 5788
diff changeset
101 if(line_end - p->iter > 0)
35f19046f809 Portability fix with realloc
albeu
parents: 5788
diff changeset
102 strncpy(p->line,p->iter,line_end - p->iter);
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
103 p->line[line_end - p->iter] = '\0';
5802
35f19046f809 Portability fix with realloc
albeu
parents: 5788
diff changeset
104 if(end[0] != '\0')
4857
f3f94fb55398 Small bugfix with getting playlist last line.
albeu
parents: 4782
diff changeset
105 end++;
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
106
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
107 if(!p->keep) {
4857
f3f94fb55398 Small bugfix with getting playlist last line.
albeu
parents: 4782
diff changeset
108 if(end[0] != '\0') {
5788
8bd1c1e319fb Fix a bug produced when line are terminated with \r\n and not a single
albeu
parents: 4857
diff changeset
109 p->buffer_end -= end-p->iter;
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
110 memmove(p->buffer,end,p->buffer_end);
10694
5eb539aa5250 Fix the bug found by Martin Wulffeld
albeu
parents: 10487
diff changeset
111 p->buffer[p->buffer_end] = '\0';
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
112 } else
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
113 p->buffer_end = 0;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
114 p->iter = p->buffer;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
115 } else
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
116 p->iter = end;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
117
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
118 return p->line;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
119 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
120
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
121 static void
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
122 play_tree_parser_reset(play_tree_parser_t* p) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
123 p->iter = p->buffer;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
124 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
125
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
126 static void
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
127 play_tree_parser_stop_keeping(play_tree_parser_t* p) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
128 p->keep = 0;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
129 if(p->iter && p->iter != p->buffer) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
130 p->buffer_end -= p->iter -p->buffer;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
131 if(p->buffer_end)
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
132 memmove(p->buffer,p->iter,p->buffer_end);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
133 p->iter = p->buffer;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
134 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
135 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
136
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
137
18916
a95ed361d16b several function from playtreeparser.c maked static,
reynaldo
parents: 18879
diff changeset
138 static play_tree_t*
4308
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
139 parse_asx(play_tree_parser_t* p) {
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
140 int comments = 0,get_line = 1;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
141 char* line = NULL;
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
142
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
143 mp_msg(MSGT_PLAYTREE,MSGL_V,"Trying asx...\n");
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
144
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
145 while(1) {
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
146 if(get_line) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
147 line = play_tree_parser_get_line(p);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
148 if(!line)
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
149 return NULL;
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
150 strstrip(line);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
151 if(line[0] == '\0')
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
152 continue;
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
153 }
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
154 if(!comments) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
155 if(line[0] != '<') {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
156 mp_msg(MSGT_PLAYTREE,MSGL_DBG2,"First char isn't '<' but '%c'\n",line[0]);
4308
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
157 mp_msg(MSGT_PLAYTREE,MSGL_DBG3,"Buffer = [%s]\n",p->buffer);
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
158 return NULL;
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
159 } else if(strncmp(line,"<!--",4) == 0) { // Comments
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
160 comments = 1;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
161 line += 4;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
162 if(line[0] != '\0' && strlen(line) > 0)
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
163 get_line = 0;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
164 } else if(strncasecmp(line,"<ASX",4) == 0) // We got an asx element
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
165 break;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
166 else // We don't get an asx
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
167 return NULL;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
168 } else { // Comments
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
169 char* c;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
170 c = strchr(line,'-');
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
171 if(c) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
172 if (strncmp(c,"--!>",4) == 0) { // End of comments
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
173 comments = 0;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
174 line = c+4;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
175 if(line[0] != '\0') // There is some more data on this line : keep it
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
176 get_line = 0;
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
177
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
178 } else {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
179 line = c+1; // Jump the -
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
180 if(line[0] != '\0') // Some more data
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
181 get_line = 0;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
182 else // End of line
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
183 get_line = 1;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
184 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
185 } else // No - on this line (or rest of line) : get next one
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
186 get_line = 1;
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
187 }
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
188 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
189
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
190 mp_msg(MSGT_PLAYTREE,MSGL_V,"Detected asx format\n");
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
191
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
192 // We have an asx : load it in memory and parse
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
193
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
194 while((line = play_tree_parser_get_line(p)) != NULL)
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
195 /* NOTHING */;
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
196
10487
11ec7586a0fe Typos fixed, based on patch sent by Alex.
diego
parents: 10397
diff changeset
197 mp_msg(MSGT_PLAYTREE,MSGL_DBG3,"Parsing asx file: [%s]\n",p->buffer);
4308
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
198 return asx_parser_build_tree(p->buffer,p->deep);
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
199 }
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
200
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
201 static char*
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
202 pls_entry_get_value(char* line) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
203 char* i;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
204
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
205 i = strchr(line,'=');
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
206 if(!i || i[1] == '\0')
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
207 return NULL;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
208 else
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
209 return i+1;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
210 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
211
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
212 typedef struct pls_entry {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
213 char* file;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
214 char* title;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
215 char* length;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
216 } pls_entry_t;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
217
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
218 static int
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
219 pls_read_entry(char* line,pls_entry_t** _e,int* _max_entry,char** val) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
220 int num,max_entry = (*_max_entry);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
221 pls_entry_t* e = (*_e);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
222 char* v;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
223
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
224 v = pls_entry_get_value(line);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
225 if(!v) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
226 mp_msg(MSGT_PLAYTREE,MSGL_ERR,"No value in entry %s\n",line);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
227 return 0;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
228 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
229
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
230 num = atoi(line);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
231 if(num < 0) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
232 num = max_entry+1;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
233 mp_msg(MSGT_PLAYTREE,MSGL_WARN,"No entry index in entry %s\nAssuming %d\n",line,num);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
234 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
235 if(num > max_entry) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
236 e = (pls_entry_t*)realloc(e,num*sizeof(pls_entry_t));
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
237 memset(&e[max_entry],0,(num-max_entry)*sizeof(pls_entry_t));
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
238 max_entry = num;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
239 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
240 (*_e) = e;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
241 (*_max_entry) = max_entry;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
242 (*val) = v;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
243
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
244 return num;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
245 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
246
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
247
18916
a95ed361d16b several function from playtreeparser.c maked static,
reynaldo
parents: 18879
diff changeset
248 static play_tree_t*
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
249 parse_pls(play_tree_parser_t* p) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
250 char *line,*v;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
251 pls_entry_t* entries = NULL;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
252 int n_entries = 0,max_entry=0,num;
9789
45173e0d34cc Fix the incredible slowness with very long list. Now a 10^6 entries
albeu
parents: 9749
diff changeset
253 play_tree_t *list = NULL, *entry = NULL, *last_entry = NULL;
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
254
10487
11ec7586a0fe Typos fixed, based on patch sent by Alex.
diego
parents: 10397
diff changeset
255 mp_msg(MSGT_PLAYTREE,MSGL_V,"Trying Winamp playlist...\n");
20834
e00250fc2b51 Skip empty lines in front of winamp playlist.
rtogni
parents: 19271
diff changeset
256 while((line = play_tree_parser_get_line(p))) {
e00250fc2b51 Skip empty lines in front of winamp playlist.
rtogni
parents: 19271
diff changeset
257 strstrip(line);
e00250fc2b51 Skip empty lines in front of winamp playlist.
rtogni
parents: 19271
diff changeset
258 if(strlen(line))
e00250fc2b51 Skip empty lines in front of winamp playlist.
rtogni
parents: 19271
diff changeset
259 break;
e00250fc2b51 Skip empty lines in front of winamp playlist.
rtogni
parents: 19271
diff changeset
260 }
e00250fc2b51 Skip empty lines in front of winamp playlist.
rtogni
parents: 19271
diff changeset
261 if (!line)
8925
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8907
diff changeset
262 return NULL;
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
263 if(strcasecmp(line,"[playlist]"))
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
264 return NULL;
10487
11ec7586a0fe Typos fixed, based on patch sent by Alex.
diego
parents: 10397
diff changeset
265 mp_msg(MSGT_PLAYTREE,MSGL_V,"Detected Winamp playlist format\n");
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
266 play_tree_parser_stop_keeping(p);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
267 line = play_tree_parser_get_line(p);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
268 if(!line)
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
269 return NULL;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
270 strstrip(line);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
271 if(strncasecmp(line,"NumberOfEntries",15) == 0) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
272 v = pls_entry_get_value(line);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
273 n_entries = atoi(v);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
274 if(n_entries < 0)
10487
11ec7586a0fe Typos fixed, based on patch sent by Alex.
diego
parents: 10397
diff changeset
275 mp_msg(MSGT_PLAYTREE,MSGL_DBG2,"Invalid number of entries: very funny!!!\n");
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
276 else
10487
11ec7586a0fe Typos fixed, based on patch sent by Alex.
diego
parents: 10397
diff changeset
277 mp_msg(MSGT_PLAYTREE,MSGL_DBG2,"Playlist claims to have %d entries. Let's see.\n",n_entries);
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
278 line = play_tree_parser_get_line(p);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
279 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
280
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
281 while(line) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
282 strstrip(line);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
283 if(line[0] == '\0') {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
284 line = play_tree_parser_get_line(p);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
285 continue;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
286 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
287 if(strncasecmp(line,"File",4) == 0) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
288 num = pls_read_entry(line+4,&entries,&max_entry,&v);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
289 if(num < 0)
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
290 mp_msg(MSGT_PLAYTREE,MSGL_ERR,"No value in entry %s\n",line);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
291 else
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
292 entries[num-1].file = strdup(v);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
293 } else if(strncasecmp(line,"Title",5) == 0) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
294 num = pls_read_entry(line+5,&entries,&max_entry,&v);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
295 if(num < 0)
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
296 mp_msg(MSGT_PLAYTREE,MSGL_ERR,"No value in entry %s\n",line);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
297 else
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
298 entries[num-1].title = strdup(v);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
299 } else if(strncasecmp(line,"Length",6) == 0) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
300 num = pls_read_entry(line+6,&entries,&max_entry,&v);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
301 if(num < 0)
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
302 mp_msg(MSGT_PLAYTREE,MSGL_ERR,"No value in entry %s\n",line);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
303 else
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
304 entries[num-1].length = strdup(v);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
305 } else
10397
6180d7558f75 output typo fixes: unknow --> unknown
diego
parents: 9789
diff changeset
306 mp_msg(MSGT_PLAYTREE,MSGL_WARN,"Unknown entry type %s\n",line);
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
307 line = play_tree_parser_get_line(p);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
308 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
309
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
310 for(num = 0; num < max_entry ; num++) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
311 if(entries[num].file == NULL)
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
312 mp_msg(MSGT_PLAYTREE,MSGL_ERR,"Entry %d don't have a file !!!!\n",num+1);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
313 else {
5866
0f5f626e5151 Handle winamp playlist as sublist.
albeu
parents: 5802
diff changeset
314 mp_msg(MSGT_PLAYTREE,MSGL_DBG2,"Adding entry %s\n",entries[num].file);
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
315 entry = play_tree_new();
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
316 play_tree_add_file(entry,entries[num].file);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
317 free(entries[num].file);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
318 if(list)
9789
45173e0d34cc Fix the incredible slowness with very long list. Now a 10^6 entries
albeu
parents: 9749
diff changeset
319 play_tree_append_entry(last_entry,entry);
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
320 else
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
321 list = entry;
9789
45173e0d34cc Fix the incredible slowness with very long list. Now a 10^6 entries
albeu
parents: 9749
diff changeset
322 last_entry = entry;
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
323 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
324 if(entries[num].title) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
325 // When we have info in playtree we add this info
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
326 free(entries[num].title);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
327 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
328 if(entries[num].length) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
329 // When we have info in playtree we add this info
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
330 free(entries[num].length);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
331 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
332 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
333
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
334 free(entries);
5866
0f5f626e5151 Handle winamp playlist as sublist.
albeu
parents: 5802
diff changeset
335
0f5f626e5151 Handle winamp playlist as sublist.
albeu
parents: 5802
diff changeset
336 entry = play_tree_new();
0f5f626e5151 Handle winamp playlist as sublist.
albeu
parents: 5802
diff changeset
337 play_tree_set_child(entry,list);
0f5f626e5151 Handle winamp playlist as sublist.
albeu
parents: 5802
diff changeset
338 return entry;
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
339 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
340
8897
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
341 /*
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
342 Reference Ini-Format: Each entry is assumed a reference
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
343 */
18916
a95ed361d16b several function from playtreeparser.c maked static,
reynaldo
parents: 18879
diff changeset
344 static play_tree_t*
8897
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
345 parse_ref_ini(play_tree_parser_t* p) {
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
346 char *line,*v;
9789
45173e0d34cc Fix the incredible slowness with very long list. Now a 10^6 entries
albeu
parents: 9749
diff changeset
347 play_tree_t *list = NULL, *entry = NULL, *last_entry = NULL;
8897
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
348
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
349 mp_msg(MSGT_PLAYTREE,MSGL_V,"Trying reference-ini playlist...\n");
8925
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8907
diff changeset
350 if (!(line = play_tree_parser_get_line(p)))
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8907
diff changeset
351 return NULL;
8897
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
352 strstrip(line);
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
353 if(strcasecmp(line,"[Reference]"))
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
354 return NULL;
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
355 mp_msg(MSGT_PLAYTREE,MSGL_V,"Detected reference-ini playlist format\n");
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
356 play_tree_parser_stop_keeping(p);
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
357 line = play_tree_parser_get_line(p);
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
358 if(!line)
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
359 return NULL;
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
360 while(line) {
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
361 strstrip(line);
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
362 if(strncasecmp(line,"Ref",3) == 0) {
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
363 v = pls_entry_get_value(line+3);
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
364 if(!v)
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
365 mp_msg(MSGT_PLAYTREE,MSGL_ERR,"No value in entry %s\n",line);
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
366 else
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
367 {
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
368 mp_msg(MSGT_PLAYTREE,MSGL_DBG2,"Adding entry %s\n",v);
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
369 entry = play_tree_new();
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
370 play_tree_add_file(entry,v);
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
371 if(list)
9789
45173e0d34cc Fix the incredible slowness with very long list. Now a 10^6 entries
albeu
parents: 9749
diff changeset
372 play_tree_append_entry(last_entry,entry);
8897
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
373 else
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
374 list = entry;
9789
45173e0d34cc Fix the incredible slowness with very long list. Now a 10^6 entries
albeu
parents: 9749
diff changeset
375 last_entry = entry;
8897
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
376 }
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
377 }
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
378 line = play_tree_parser_get_line(p);
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
379 }
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
380
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
381 if(!list) return NULL;
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
382 entry = play_tree_new();
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
383 play_tree_set_child(entry,list);
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
384 return entry;
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
385 }
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
386
18916
a95ed361d16b several function from playtreeparser.c maked static,
reynaldo
parents: 18879
diff changeset
387 static play_tree_t*
6661
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
388 parse_m3u(play_tree_parser_t* p) {
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
389 char* line;
9789
45173e0d34cc Fix the incredible slowness with very long list. Now a 10^6 entries
albeu
parents: 9749
diff changeset
390 play_tree_t *list = NULL, *entry = NULL, *last_entry = NULL;
6661
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
391
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
392 mp_msg(MSGT_PLAYTREE,MSGL_V,"Trying extended m3u playlist...\n");
8925
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8907
diff changeset
393 if (!(line = play_tree_parser_get_line(p)))
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8907
diff changeset
394 return NULL;
6661
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
395 strstrip(line);
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
396 if(strcasecmp(line,"#EXTM3U"))
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
397 return NULL;
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
398 mp_msg(MSGT_PLAYTREE,MSGL_V,"Detected extended m3u playlist format\n");
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
399 play_tree_parser_stop_keeping(p);
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
400
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
401 while((line = play_tree_parser_get_line(p)) != NULL) {
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
402 strstrip(line);
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
403 if(line[0] == '\0')
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
404 continue;
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
405 /* EXTM3U files contain such lines:
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
406 * #EXTINF:<seconds>, <title>
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
407 * followed by a line with the filename
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
408 * for now we have no place to put that
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
409 * so we just skip that extra-info ::atmos
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
410 */
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
411 if(line[0] == '#') {
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
412 #if 0 /* code functional */
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
413 if(strncasecmp(line,"#EXTINF:",8) == 0) {
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
414 mp_msg(MSGT_PLAYTREE,MSGL_INFO,"[M3U] Duration: %dsec Title: %s\n",
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
415 strtol(line+8,&line,10), line+2);
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
416 }
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
417 #endif
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
418 continue;
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
419 }
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
420 entry = play_tree_new();
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
421 play_tree_add_file(entry,line);
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
422 if(!list)
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
423 list = entry;
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
424 else
9789
45173e0d34cc Fix the incredible slowness with very long list. Now a 10^6 entries
albeu
parents: 9749
diff changeset
425 play_tree_append_entry(last_entry,entry);
45173e0d34cc Fix the incredible slowness with very long list. Now a 10^6 entries
albeu
parents: 9749
diff changeset
426 last_entry = entry;
6661
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
427 }
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
428
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
429 if(!list) return NULL;
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
430 entry = play_tree_new();
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
431 play_tree_set_child(entry,list);
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
432 return entry;
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
433 }
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
434
18916
a95ed361d16b several function from playtreeparser.c maked static,
reynaldo
parents: 18879
diff changeset
435 static play_tree_t*
12097
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
436 parse_smil(play_tree_parser_t* p) {
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
437 int entrymode=0;
22242
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
438 char* line,source[512],*pos,*s_start,*s_end,*src_line;
12097
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
439 play_tree_t *list = NULL, *entry = NULL, *last_entry = NULL;
22242
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
440 int is_rmsmil = 0;
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
441 unsigned int npkt, ttlpkt;
12097
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
442
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
443 mp_msg(MSGT_PLAYTREE,MSGL_V,"Trying smil playlist...\n");
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
444
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
445 // Check if smil
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
446 while((line = play_tree_parser_get_line(p)) != NULL) {
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
447 strstrip(line);
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
448 if(line[0] == '\0') // Ignore empties
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
449 continue;
22518
29a3bb75db47 Support smil embedded into xml, fixes bugzilla #768
rtogni
parents: 22477
diff changeset
450 if (strncasecmp(line,"<?xml",5)==0) // smil in xml
29a3bb75db47 Support smil embedded into xml, fixes bugzilla #768
rtogni
parents: 22477
diff changeset
451 continue;
22242
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
452 if (strncasecmp(line,"<smil",5)==0 || strncasecmp(line,"<?wpl",5)==0 ||
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
453 strncasecmp(line,"(smil-document",14)==0)
12097
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
454 break; // smil header found
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
455 else
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
456 return NULL; //line not smil exit
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
457 }
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
458
24962
fb50e37df836 Fix possible null-pointer-dereference in parse_smil().
cehoyos
parents: 24424
diff changeset
459 if (!line) return NULL;
12097
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
460 mp_msg(MSGT_PLAYTREE,MSGL_V,"Detected smil playlist format\n");
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
461 play_tree_parser_stop_keeping(p);
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
462
22242
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
463 if (strncasecmp(line,"(smil-document",14)==0) {
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
464 mp_msg(MSGT_PLAYTREE,MSGL_V,"Special smil-over-realrtsp playlist header\n");
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
465 is_rmsmil = 1;
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
466 if (sscanf(line, "(smil-document (ver 1.0)(npkt %u)(ttlpkt %u", &npkt, &ttlpkt) != 2) {
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
467 mp_msg(MSGT_PLAYTREE,MSGL_WARN,"smil-over-realrtsp: header parsing failure, assuming single packet.\n");
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
468 npkt = ttlpkt = 1;
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
469 }
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
470 if (ttlpkt == 0 || npkt > ttlpkt) {
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
471 mp_msg(MSGT_PLAYTREE,MSGL_WARN,"smil-over-realrtsp: bad packet counters (npkk = %u, ttlpkt = %u), assuming single packet.\n",
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
472 npkt, ttlpkt);
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
473 npkt = ttlpkt = 1;
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
474 }
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
475 }
12097
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
476
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
477 //Get entries from smil
22712
c7eee1ecbe8c Support multiple tags in a single line and tags on the same line as the
rtogni
parents: 22520
diff changeset
478 src_line = line;
22242
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
479 line = NULL;
22712
c7eee1ecbe8c Support multiple tags in a single line and tags on the same line as the
rtogni
parents: 22520
diff changeset
480 do {
22242
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
481 strstrip(src_line);
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
482 if (line) {
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
483 free(line);
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
484 line = NULL;
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
485 }
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
486 /* If we're parsing smil over realrtsp and this is not the last packet and
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
487 * this is the last line in the packet (terminating with ") ) we must get
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
488 * the next line, strip the header, and concatenate it to the current line.
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
489 */
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
490 if (is_rmsmil && npkt != ttlpkt && strstr(src_line,"\")")) {
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
491 char *payload;
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
492
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
493 line = strdup(src_line);
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
494 if(!(src_line = play_tree_parser_get_line(p))) {
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
495 mp_msg(MSGT_PLAYTREE,MSGL_WARN,"smil-over-realrtsp: can't get line from packet %u/%u.\n", npkt, ttlpkt);
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
496 break;
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
497 }
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
498 strstrip(src_line);
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
499 // Skip header, packet starts after "
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
500 if(!(payload = strchr(src_line,'\"'))) {
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
501 mp_msg(MSGT_PLAYTREE,MSGL_WARN,"smil-over-realrtsp: can't find start of packet, using complete line.\n");
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
502 payload = src_line;
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
503 } else
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
504 payload++;
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
505 // Skip ") at the end of the last line from the current packet
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
506 line[strlen(line)-2] = 0;
22477
e305132d083b 100l, allocated buffer was too small.
rtogni
parents: 22242
diff changeset
507 line = realloc(line, strlen(line)+strlen(payload)+1);
22242
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
508 strcat (line, payload);
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
509 npkt++;
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
510 } else
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
511 line = strdup(src_line);
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
512 /* Unescape \" to " for smil-over-rtsp */
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
513 if (is_rmsmil && line[0] != '\0') {
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
514 int i, j;
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
515
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
516 for (i = 0; i < strlen(line); i++)
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
517 if (line[i] == '\\' && line[i+1] == '"')
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
518 for (j = i; line[j]; j++)
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
519 line[j] = line[j+1];
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
520 }
22712
c7eee1ecbe8c Support multiple tags in a single line and tags on the same line as the
rtogni
parents: 22520
diff changeset
521 pos = line;
c7eee1ecbe8c Support multiple tags in a single line and tags on the same line as the
rtogni
parents: 22520
diff changeset
522 while (pos) {
12097
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
523 if (!entrymode) { // all entries filled so far
24424
0c4f1a88eaae warning fixes:
diego
parents: 23774
diff changeset
524 while ((pos=strchr(pos, '<'))) {
22712
c7eee1ecbe8c Support multiple tags in a single line and tags on the same line as the
rtogni
parents: 22520
diff changeset
525 if (strncasecmp(pos,"<video",6)==0 || strncasecmp(pos,"<audio",6)==0 || strncasecmp(pos,"<media",6)==0) {
12097
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
526 entrymode=1;
22712
c7eee1ecbe8c Support multiple tags in a single line and tags on the same line as the
rtogni
parents: 22520
diff changeset
527 break; // Got a valid tag, exit '<' search loop
12097
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
528 }
22712
c7eee1ecbe8c Support multiple tags in a single line and tags on the same line as the
rtogni
parents: 22520
diff changeset
529 pos++;
c7eee1ecbe8c Support multiple tags in a single line and tags on the same line as the
rtogni
parents: 22520
diff changeset
530 }
22520
e227eb76450d Remove code duplication in smil parser
rtogni
parents: 22518
diff changeset
531 }
e227eb76450d Remove code duplication in smil parser
rtogni
parents: 22518
diff changeset
532 if (entrymode) { //Entry found but not yet filled
22712
c7eee1ecbe8c Support multiple tags in a single line and tags on the same line as the
rtogni
parents: 22520
diff changeset
533 pos = strstr(pos,"src="); // Is source present on this line
12097
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
534 if (pos != NULL) {
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
535 entrymode=0;
23774
16a67232e916 realrtsp smil files can also use ' as field delimiter instead of "
rtogni
parents: 22712
diff changeset
536 if (pos[4] != '"' && pos[4] != '\'') {
16a67232e916 realrtsp smil files can also use ' as field delimiter instead of "
rtogni
parents: 22712
diff changeset
537 mp_msg(MSGT_PLAYTREE,MSGL_V,"Unknown delimiter %c in source line %s\n", pos[4], line);
16a67232e916 realrtsp smil files can also use ' as field delimiter instead of "
rtogni
parents: 22712
diff changeset
538 break;
16a67232e916 realrtsp smil files can also use ' as field delimiter instead of "
rtogni
parents: 22712
diff changeset
539 }
12097
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
540 s_start=pos+5;
23774
16a67232e916 realrtsp smil files can also use ' as field delimiter instead of "
rtogni
parents: 22712
diff changeset
541 s_end=strchr(s_start,pos[4]);
12097
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
542 if (s_end == NULL) {
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
543 mp_msg(MSGT_PLAYTREE,MSGL_V,"Error parsing this source line %s\n",line);
22712
c7eee1ecbe8c Support multiple tags in a single line and tags on the same line as the
rtogni
parents: 22520
diff changeset
544 break;
12097
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
545 }
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
546 if (s_end-s_start> 511) {
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
547 mp_msg(MSGT_PLAYTREE,MSGL_V,"Cannot store such a large source %s\n",line);
22712
c7eee1ecbe8c Support multiple tags in a single line and tags on the same line as the
rtogni
parents: 22520
diff changeset
548 break;
12097
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
549 }
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
550 strncpy(source,s_start,s_end-s_start);
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
551 source[(s_end-s_start)]='\0'; // Null terminate
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
552 entry = play_tree_new();
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
553 play_tree_add_file(entry,source);
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
554 if(!list) //Insert new entry
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
555 list = entry;
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
556 else
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
557 play_tree_append_entry(last_entry,entry);
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
558 last_entry = entry;
22712
c7eee1ecbe8c Support multiple tags in a single line and tags on the same line as the
rtogni
parents: 22520
diff changeset
559 pos = s_end;
12097
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
560 }
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
561 }
22712
c7eee1ecbe8c Support multiple tags in a single line and tags on the same line as the
rtogni
parents: 22520
diff changeset
562 }
c7eee1ecbe8c Support multiple tags in a single line and tags on the same line as the
rtogni
parents: 22520
diff changeset
563 } while((src_line = play_tree_parser_get_line(p)) != NULL);
12097
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
564
22242
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
565 if (line)
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
566 free(line);
4cabf7499fef Add support for smil playlist served over realrtsp
rtogni
parents: 21910
diff changeset
567
12097
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
568 if(!list) return NULL; // Nothing found
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
569
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
570 entry = play_tree_new();
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
571 play_tree_set_child(entry,list);
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
572 return entry;
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
573 }
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
574
18916
a95ed361d16b several function from playtreeparser.c maked static,
reynaldo
parents: 18879
diff changeset
575 static play_tree_t*
12097
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
576 embedded_playlist_parse(char *line) {
12223
e7c8200ffdc5 Respect -playlist for asx streams
rtognimp
parents: 12097
diff changeset
577 int f=DEMUXER_TYPE_PLAYLIST;
12097
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
578 stream_t* stream;
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
579 play_tree_parser_t* ptp;
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
580 play_tree_t* entry;
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
581
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
582 // Get stream opened to link
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
583 stream=open_stream(line,0,&f);
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
584 if(!stream) {
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
585 mp_msg(MSGT_PLAYTREE,MSGL_WARN,"Can't open playlist %s\n",line);
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
586 return NULL;
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
587 }
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
588
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
589 //add new playtree
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
590 mp_msg(MSGT_PLAYTREE,MSGL_V,"Adding playlist %s to element entryref\n",line);
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
591
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
592 ptp = play_tree_parser_new(stream,1);
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
593 entry = play_tree_parser_get_play_tree(ptp, 1);
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
594 play_tree_parser_free(ptp);
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
595 free_stream(stream);
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
596
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
597 return entry;
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
598 }
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
599
18916
a95ed361d16b several function from playtreeparser.c maked static,
reynaldo
parents: 18879
diff changeset
600 static play_tree_t*
4308
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
601 parse_textplain(play_tree_parser_t* p) {
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
602 char* line;
12300
95ea9f5f6f14 Fix embedded smil playlist detection if there are parameters on the url
rtognimp
parents: 12223
diff changeset
603 char *c;
95ea9f5f6f14 Fix embedded smil playlist detection if there are parameters on the url
rtognimp
parents: 12223
diff changeset
604 int embedded;
9789
45173e0d34cc Fix the incredible slowness with very long list. Now a 10^6 entries
albeu
parents: 9749
diff changeset
605 play_tree_t *list = NULL, *entry = NULL, *last_entry = NULL;
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
606
6661
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
607 mp_msg(MSGT_PLAYTREE,MSGL_V,"Trying plaintext playlist...\n");
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
608 play_tree_parser_stop_keeping(p);
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
609
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
610 while((line = play_tree_parser_get_line(p)) != NULL) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
611 strstrip(line);
12689
050c90536ddd Support for comments in plaintext playlist by adland
alex
parents: 12538
diff changeset
612 if(line[0] == '\0' || line[0] == '#' || (line[0] == '/' && line[1] == '/'))
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
613 continue;
12097
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
614
12538
2beafad68f68 Enhance detection of embedded smil playlist, add embedded ram playlist
rtognimp
parents: 12300
diff changeset
615 //Special check for embedded smil or ram reference in file
12300
95ea9f5f6f14 Fix embedded smil playlist detection if there are parameters on the url
rtognimp
parents: 12223
diff changeset
616 embedded = 0;
95ea9f5f6f14 Fix embedded smil playlist detection if there are parameters on the url
rtognimp
parents: 12223
diff changeset
617 if (strlen(line) > 5)
95ea9f5f6f14 Fix embedded smil playlist detection if there are parameters on the url
rtognimp
parents: 12223
diff changeset
618 for(c = line; c[0]; c++ )
12538
2beafad68f68 Enhance detection of embedded smil playlist, add embedded ram playlist
rtognimp
parents: 12300
diff changeset
619 if ( ((c[0] == '.') && //start with . and next have smil with optional ? or &
2beafad68f68 Enhance detection of embedded smil playlist, add embedded ram playlist
rtognimp
parents: 12300
diff changeset
620 (tolower(c[1]) == 's') && (tolower(c[2])== 'm') &&
12300
95ea9f5f6f14 Fix embedded smil playlist detection if there are parameters on the url
rtognimp
parents: 12223
diff changeset
621 (tolower(c[3]) == 'i') && (tolower(c[4]) == 'l') &&
12538
2beafad68f68 Enhance detection of embedded smil playlist, add embedded ram playlist
rtognimp
parents: 12300
diff changeset
622 (!c[5] || c[5] == '?' || c[5] == '&')) || // or
2beafad68f68 Enhance detection of embedded smil playlist, add embedded ram playlist
rtognimp
parents: 12300
diff changeset
623 ((c[0] == '.') && // start with . and next have smi or ram with optional ? or &
2beafad68f68 Enhance detection of embedded smil playlist, add embedded ram playlist
rtognimp
parents: 12300
diff changeset
624 ( ((tolower(c[1]) == 's') && (tolower(c[2])== 'm') && (tolower(c[3]) == 'i')) ||
2beafad68f68 Enhance detection of embedded smil playlist, add embedded ram playlist
rtognimp
parents: 12300
diff changeset
625 ((tolower(c[1]) == 'r') && (tolower(c[2])== 'a') && (tolower(c[3]) == 'm')) )
2beafad68f68 Enhance detection of embedded smil playlist, add embedded ram playlist
rtognimp
parents: 12300
diff changeset
626 && (!c[4] || c[4] == '?' || c[4] == '&')) ){
12300
95ea9f5f6f14 Fix embedded smil playlist detection if there are parameters on the url
rtognimp
parents: 12223
diff changeset
627 entry=embedded_playlist_parse(line);
95ea9f5f6f14 Fix embedded smil playlist detection if there are parameters on the url
rtognimp
parents: 12223
diff changeset
628 embedded = 1;
95ea9f5f6f14 Fix embedded smil playlist detection if there are parameters on the url
rtognimp
parents: 12223
diff changeset
629 break;
95ea9f5f6f14 Fix embedded smil playlist detection if there are parameters on the url
rtognimp
parents: 12223
diff changeset
630 }
95ea9f5f6f14 Fix embedded smil playlist detection if there are parameters on the url
rtognimp
parents: 12223
diff changeset
631
95ea9f5f6f14 Fix embedded smil playlist detection if there are parameters on the url
rtognimp
parents: 12223
diff changeset
632 if (!embedded) { //regular file link
12097
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
633 entry = play_tree_new();
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
634 play_tree_add_file(entry,line);
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
635 }
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
636
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
637 if (entry != NULL) {
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
638 if(!list)
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
639 list = entry;
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
640 else
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
641 play_tree_append_entry(last_entry,entry);
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
642 last_entry = entry;
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
643 }
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
644 }
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
645
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
646 if(!list) return NULL;
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
647 entry = play_tree_new();
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
648 play_tree_set_child(entry,list);
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
649 return entry;
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
650 }
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
651
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
652 play_tree_t*
8925
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8907
diff changeset
653 parse_playtree(stream_t *stream, int forced) {
4308
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
654 play_tree_parser_t* p;
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
655 play_tree_t* ret;
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
656
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4043
diff changeset
657 #ifdef MP_DEBUG
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
658 assert(stream != NULL);
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
659 #endif
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
660
4308
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
661 p = play_tree_parser_new(stream,0);
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
662 if(!p)
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
663 return NULL;
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
664
8925
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8907
diff changeset
665 ret = play_tree_parser_get_play_tree(p, forced);
4308
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
666 play_tree_parser_free(p);
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
667
4308
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
668 return ret;
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
669 }
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
670
6662
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
671 static void
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
672 play_tree_add_basepath(play_tree_t* pt, char* bp) {
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
673 int i,bl = strlen(bp),fl;
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
674
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
675 if(pt->child) {
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
676 play_tree_t* i;
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
677 for(i = pt->child ; i != NULL ; i = i->next)
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
678 play_tree_add_basepath(i,bp);
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
679 return;
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
680 }
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
681
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
682 if(!pt->files)
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
683 return;
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
684
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
685 for(i = 0 ; pt->files[i] != NULL ; i++) {
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
686 fl = strlen(pt->files[i]);
13305
90ffe76b5b25 Don't prepend basepath to a full unix path. ( 10l to Joey. )
al
parents: 13010
diff changeset
687 // if we find a full unix path, url:// or X:\ at the beginning,
90ffe76b5b25 Don't prepend basepath to a full unix path. ( 10l to Joey. )
al
parents: 13010
diff changeset
688 // don't mangle it.
90ffe76b5b25 Don't prepend basepath to a full unix path. ( 10l to Joey. )
al
parents: 13010
diff changeset
689 if(fl <= 0 || strstr(pt->files[i],"://") || (strstr(pt->files[i],":\\") == pt->files[i] + 1) || (pt->files[i][0] == '/') )
6662
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
690 continue;
13010
047bbb973011 windows path seperator fixes
joey
parents: 12689
diff changeset
691 // if the path begins with \ then prepend drive letter to it.
047bbb973011 windows path seperator fixes
joey
parents: 12689
diff changeset
692 if (pt->files[i][0] == '\\') {
18928
586777f09b1b relative-to-absolute path fixes: Do not prepend drive letter to \\ paths.
reimar
parents: 18916
diff changeset
693 if (pt->files[i][1] == '\\')
586777f09b1b relative-to-absolute path fixes: Do not prepend drive letter to \\ paths.
reimar
parents: 18916
diff changeset
694 continue;
13010
047bbb973011 windows path seperator fixes
joey
parents: 12689
diff changeset
695 pt->files[i] = (char*)realloc(pt->files[i],2+fl+1);
047bbb973011 windows path seperator fixes
joey
parents: 12689
diff changeset
696 memmove(pt->files[i] + 2,pt->files[i],fl+1);
047bbb973011 windows path seperator fixes
joey
parents: 12689
diff changeset
697 memcpy(pt->files[i],bp,2);
18928
586777f09b1b relative-to-absolute path fixes: Do not prepend drive letter to \\ paths.
reimar
parents: 18916
diff changeset
698 continue;
13010
047bbb973011 windows path seperator fixes
joey
parents: 12689
diff changeset
699 }
6662
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
700 pt->files[i] = (char*)realloc(pt->files[i],bl+fl+1);
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
701 memmove(pt->files[i] + bl,pt->files[i],fl+1);
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
702 memcpy(pt->files[i],bp,bl);
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
703 }
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
704 }
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
705
9301
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9089
diff changeset
706 // Wrapper for play_tree_add_basepath (add base path from file)
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9089
diff changeset
707 void play_tree_add_bpf(play_tree_t* pt, char* filename)
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9089
diff changeset
708 {
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9089
diff changeset
709 char *ls, *file;
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9089
diff changeset
710
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9089
diff changeset
711 if (pt && filename)
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9089
diff changeset
712 {
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9089
diff changeset
713 file = strdup(filename);
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9089
diff changeset
714 if (file)
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9089
diff changeset
715 {
13010
047bbb973011 windows path seperator fixes
joey
parents: 12689
diff changeset
716 ls = strrchr(file,'/');
047bbb973011 windows path seperator fixes
joey
parents: 12689
diff changeset
717 if(!ls) ls = strrchr(file,'\\');
9301
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9089
diff changeset
718 if(ls) {
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9089
diff changeset
719 ls[1] = '\0';
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9089
diff changeset
720 play_tree_add_basepath(pt,file);
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9089
diff changeset
721 }
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9089
diff changeset
722 free(file);
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9089
diff changeset
723 }
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9089
diff changeset
724 }
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9089
diff changeset
725 }
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9089
diff changeset
726
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
727 play_tree_t*
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
728 parse_playlist_file(char* file) {
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
729 stream_t *stream;
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
730 play_tree_t* ret;
12223
e7c8200ffdc5 Respect -playlist for asx streams
rtognimp
parents: 12097
diff changeset
731 int f=DEMUXER_TYPE_PLAYLIST;
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
732
9749
58e5880f4788 Use new config headers
albeu
parents: 9301
diff changeset
733 stream = open_stream(file,0,&f);
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
734
9749
58e5880f4788 Use new config headers
albeu
parents: 9301
diff changeset
735 if(!stream) {
10487
11ec7586a0fe Typos fixed, based on patch sent by Alex.
diego
parents: 10397
diff changeset
736 mp_msg(MSGT_PLAYTREE,MSGL_ERR,"Error while opening playlist file %s: %s\n",file,strerror(errno));
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
737 return NULL;
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
738 }
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
739
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
740 mp_msg(MSGT_PLAYTREE,MSGL_V,"Parsing playlist file %s...\n",file);
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
741
8925
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8907
diff changeset
742 ret = parse_playtree(stream,1);
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
743 free_stream(stream);
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
744
9301
7841308ad250 this patch fixes latest bug, discovered by .so ... (relative filenames &
arpi
parents: 9089
diff changeset
745 play_tree_add_bpf(ret, file);
6662
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
746
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
747 return ret;
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
748
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
749 }
4308
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
750
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
751
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
752 play_tree_parser_t*
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
753 play_tree_parser_new(stream_t* stream,int deep) {
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
754 play_tree_parser_t* p;
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
755
18879
cc65a585fdcc rm unnecesary casts from void* - part 3
reynaldo
parents: 18869
diff changeset
756 p = calloc(1,sizeof(play_tree_parser_t));
4308
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
757 if(!p)
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
758 return NULL;
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
759 p->stream = stream;
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
760 p->deep = deep;
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
761 p->keep = 1;
4308
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
762
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
763 return p;
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
764
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
765 }
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
766
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
767 void
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
768 play_tree_parser_free(play_tree_parser_t* p) {
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
769
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
770 #ifdef MP_DEBUG
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
771 assert(p != NULL);
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
772 #endif
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
773
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
774 if(p->buffer) free(p->buffer);
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
775 if(p->line) free(p->line);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
776 free(p);
4308
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
777 }
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
778
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
779 play_tree_t*
8925
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8907
diff changeset
780 play_tree_parser_get_play_tree(play_tree_parser_t* p, int forced) {
4308
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
781 play_tree_t* tree = NULL;
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
782
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
783 #ifdef MP_DEBUG
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
784 assert(p != NULL);
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
785 #endif
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
786
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
787
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
788 while(play_tree_parser_get_line(p) != NULL) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
789 play_tree_parser_reset(p);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
790
4308
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
791 tree = parse_asx(p);
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
792 if(tree) break;
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
793 play_tree_parser_reset(p);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
794
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
795 tree = parse_pls(p);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
796 if(tree) break;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
797 play_tree_parser_reset(p);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
798
6661
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
799 tree = parse_m3u(p);
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
800 if(tree) break;
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
801 play_tree_parser_reset(p);
8897
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
802
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
803 tree = parse_ref_ini(p);
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
804 if(tree) break;
ef01554542fb This patch adds support for some silly ini-style-playlist-file-format ...
arpi
parents: 8164
diff changeset
805 play_tree_parser_reset(p);
6661
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
806
12097
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
807 tree = parse_smil(p);
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
808 if(tree) break;
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
809 play_tree_parser_reset(p);
cb0cdaa0bddf Support for smil playlist, both standalone and embedded into other
rtognimp
parents: 10694
diff changeset
810
4308
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
811 // Here come the others formats ( textplain must stay the last one )
8925
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8907
diff changeset
812 if (forced)
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8907
diff changeset
813 {
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8907
diff changeset
814 tree = parse_textplain(p);
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8907
diff changeset
815 if(tree) break;
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8907
diff changeset
816 }
4308
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
817 break;
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
818 }
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
819
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
820 if(tree)
10487
11ec7586a0fe Typos fixed, based on patch sent by Alex.
diego
parents: 10397
diff changeset
821 mp_msg(MSGT_PLAYTREE,MSGL_V,"Playlist successfully parsed\n");
8925
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8907
diff changeset
822 else
5c15777f1c07 this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents: 8907
diff changeset
823 mp_msg(MSGT_PLAYTREE,((forced==1)?MSGL_ERR:MSGL_V),"Error while parsing playlist\n");
4308
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
824
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
825 if(tree)
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
826 tree = play_tree_cleanup(tree);
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
827
10487
11ec7586a0fe Typos fixed, based on patch sent by Alex.
diego
parents: 10397
diff changeset
828 if(!tree) mp_msg(MSGT_PLAYTREE,((forced==1)?MSGL_WARN:MSGL_V),"Warning: empty playlist\n");
4308
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
829
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
830 return tree;
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
831 }