annotate playtreeparser.c @ 8514:a1ff87c254ff

I have rewritten the gif89a vo in order to solve some problems I had with it. These are: 1) current code is messy 2) poor comments, if any 3) inaccurate frame dropping and delay code 4) output filename hardcoded 5) output framerate as integer You may specify the output filename and framerate like so: -vo gif89a:4.33 4.33 fps output -vo gif89a:some.gif output to some.gif -vo gif89a:5.02:new.gif output to new.gif at 5.02 fps The filename defaults to out.gif, and the framerate defaults to 5 fps. by Joey Parrish <joey@nicewarrior.org>
author arpi
date Sat, 21 Dec 2002 21:07:16 +0000
parents 487cfc28525d
children ef01554542fb
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
1
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4043
diff changeset
2 #include "config.h"
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
3 #include <stdlib.h>
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
4 #include <stdio.h>
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
5 #include <string.h>
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4043
diff changeset
6 #ifdef MP_DEBUG
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
7 #include <assert.h>
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4043
diff changeset
8 #endif
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
9 #include <errno.h>
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
10 #include <sys/types.h>
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
11 #include <sys/stat.h>
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
12 #include <fcntl.h>
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
13 #include <unistd.h>
8164
487cfc28525d New config system + cleanup of header inter dependency
albeu
parents: 6663
diff changeset
14 #include "cfgparser.h"
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
15 #include "playtree.h"
4308
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
16 #include "playtreeparser.h"
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
17 #include "libmpdemux/stream.h"
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
18 #include "mp_msg.h"
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
19
6662
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
20
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
21 #if defined(__CYGWIN__) || defined(__OS2__)
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
22 #define PATH_SEP '\\'
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
23 #else
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
24 #define PATH_SEP '/'
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
25 #endif
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
26
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
27 extern play_tree_t*
4308
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
28 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
29
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
30 #define BUF_STEP 1024
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
31
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
32 #define WHITES " \n\r\t"
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
33
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
34 static void
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
35 strstrip(char* str) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
36 char* i;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
37
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
38 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
39 /* NOTHING */;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
40 if(i[0] != '\0') {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
41 memmove(str,i,strlen(i));
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
42 for(i = str + strlen(str) ; strchr(WHITES,i[0]) != NULL; i--)
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
43 /* NOTHING */;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
44 i[1] = '\0';
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
45 } else
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
46 str[0] = '\0';
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
47 }
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 static char*
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
50 play_tree_parser_get_line(play_tree_parser_t* p) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
51 char *end,*line_end;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
52 int r,resize = 0;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
53
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
54 if(p->buffer == NULL) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
55 p->buffer = (char*)malloc(BUF_STEP);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
56 p->buffer_size = BUF_STEP;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
57 p->iter = p->buffer;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
58 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
59
5802
35f19046f809 Portability fix with realloc
albeu
parents: 5788
diff changeset
60 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
61 return NULL;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
62
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
63 while(1) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
64
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
65 if(resize) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
66 r = p->iter - p->buffer;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
67 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
68 p->iter = p->buffer + r;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
69 p->buffer_size += BUF_STEP;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
70 resize = 0;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
71 }
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 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
74 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
75 if(r > 0) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
76 p->buffer_end += r;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
77 p->buffer[p->buffer_end] = '\0';
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
78 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
79 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
80
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
81 end = strchr(p->iter,'\n');
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
82 if(!end) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
83 if(p->stream->eof) {
4857
f3f94fb55398 Small bugfix with getting playlist last line.
albeu
parents: 4782
diff changeset
84 end = p->buffer + p->buffer_end;
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
85 break;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
86 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
87 resize = 1;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
88 continue;
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 break;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
91 }
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 line_end = ((*(end-1)) == '\r') ? end-1 : end;
5802
35f19046f809 Portability fix with realloc
albeu
parents: 5788
diff changeset
94 if(line_end - p->iter >= 0)
35f19046f809 Portability fix with realloc
albeu
parents: 5788
diff changeset
95 p->line = (char*)realloc(p->line,line_end - p->iter+1);
35f19046f809 Portability fix with realloc
albeu
parents: 5788
diff changeset
96 else
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
97 return NULL;
5802
35f19046f809 Portability fix with realloc
albeu
parents: 5788
diff changeset
98 if(line_end - p->iter > 0)
35f19046f809 Portability fix with realloc
albeu
parents: 5788
diff changeset
99 strncpy(p->line,p->iter,line_end - p->iter);
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
100 p->line[line_end - p->iter] = '\0';
5802
35f19046f809 Portability fix with realloc
albeu
parents: 5788
diff changeset
101 if(end[0] != '\0')
4857
f3f94fb55398 Small bugfix with getting playlist last line.
albeu
parents: 4782
diff changeset
102 end++;
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
103
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
104 if(!p->keep) {
4857
f3f94fb55398 Small bugfix with getting playlist last line.
albeu
parents: 4782
diff changeset
105 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
106 p->buffer_end -= end-p->iter;
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
107 memmove(p->buffer,end,p->buffer_end);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
108 } else
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
109 p->buffer_end = 0;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
110 p->iter = p->buffer;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
111 } else
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
112 p->iter = end;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
113
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
114 return p->line;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
115 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
116
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
117 static void
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
118 play_tree_parser_reset(play_tree_parser_t* p) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
119 p->iter = p->buffer;
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
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
122 static void
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
123 play_tree_parser_stop_keeping(play_tree_parser_t* p) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
124 p->keep = 0;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
125 if(p->iter && p->iter != p->buffer) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
126 p->buffer_end -= p->iter -p->buffer;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
127 if(p->buffer_end)
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
128 memmove(p->buffer,p->iter,p->buffer_end);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
129 p->iter = p->buffer;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
130 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
131 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
132
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
133
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
134 play_tree_t*
4308
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
135 parse_asx(play_tree_parser_t* p) {
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
136 int comments = 0,get_line = 1;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
137 char* line = NULL;
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
138
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
139 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
140
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
141 while(1) {
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
142 if(get_line) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
143 line = play_tree_parser_get_line(p);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
144 if(!line)
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
145 return NULL;
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
146 strstrip(line);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
147 if(line[0] == '\0')
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
148 continue;
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
149 }
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
150 if(!comments) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
151 if(line[0] != '<') {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
152 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
153 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
154 return NULL;
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
155 } else if(strncmp(line,"<!--",4) == 0) { // Comments
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
156 comments = 1;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
157 line += 4;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
158 if(line[0] != '\0' && strlen(line) > 0)
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
159 get_line = 0;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
160 } 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
161 break;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
162 else // We don't get an asx
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
163 return NULL;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
164 } else { // Comments
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
165 char* c;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
166 c = strchr(line,'-');
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
167 if(c) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
168 if (strncmp(c,"--!>",4) == 0) { // End of comments
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
169 comments = 0;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
170 line = c+4;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
171 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
172 get_line = 0;
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
173
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
174 } else {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
175 line = c+1; // Jump the -
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
176 if(line[0] != '\0') // Some more data
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
177 get_line = 0;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
178 else // End of line
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
179 get_line = 1;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
180 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
181 } 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
182 get_line = 1;
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
183 }
4782
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
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
186 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
187
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
188 // 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
189
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
190 while((line = play_tree_parser_get_line(p)) != NULL)
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
191 /* NOTHING */;
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
192
4308
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
193 mp_msg(MSGT_PLAYTREE,MSGL_DBG3,"Parsing asx file : [%s]\n",p->buffer);
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
194 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
195 }
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
196
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
197 static char*
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
198 pls_entry_get_value(char* line) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
199 char* i;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
200
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
201 i = strchr(line,'=');
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
202 if(!i || i[1] == '\0')
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
203 return NULL;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
204 else
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
205 return i+1;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
206 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
207
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
208 typedef struct pls_entry {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
209 char* file;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
210 char* title;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
211 char* length;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
212 } pls_entry_t;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
213
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
214 static int
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
215 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
216 int num,max_entry = (*_max_entry);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
217 pls_entry_t* e = (*_e);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
218 char* v;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
219
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
220 v = pls_entry_get_value(line);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
221 if(!v) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
222 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
223 return 0;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
224 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
225
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
226 num = atoi(line);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
227 if(num < 0) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
228 num = max_entry+1;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
229 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
230 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
231 if(num > max_entry) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
232 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
233 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
234 max_entry = num;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
235 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
236 (*_e) = e;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
237 (*_max_entry) = max_entry;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
238 (*val) = v;
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 return num;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
241 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
242
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 play_tree_t*
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
245 parse_pls(play_tree_parser_t* p) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
246 char *line,*v;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
247 pls_entry_t* entries = NULL;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
248 int n_entries = 0,max_entry=0,num;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
249 play_tree_t *list = NULL, *entry = NULL;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
250
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
251 mp_msg(MSGT_PLAYTREE,MSGL_V,"Trying winamp playlist...\n");
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
252 line = play_tree_parser_get_line(p);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
253 strstrip(line);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
254 if(strcasecmp(line,"[playlist]"))
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
255 return NULL;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
256 mp_msg(MSGT_PLAYTREE,MSGL_V,"Detected winamp playlist format\n");
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
257 play_tree_parser_stop_keeping(p);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
258 line = play_tree_parser_get_line(p);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
259 if(!line)
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
260 return NULL;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
261 strstrip(line);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
262 if(strncasecmp(line,"NumberOfEntries",15) == 0) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
263 v = pls_entry_get_value(line);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
264 n_entries = atoi(v);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
265 if(n_entries < 0)
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
266 mp_msg(MSGT_PLAYTREE,MSGL_DBG2,"Invalid number of entries : very funny !!!\n");
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
267 else
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
268 mp_msg(MSGT_PLAYTREE,MSGL_DBG2,"Playlist claim to have %d entries. Let's see.\n",n_entries);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
269 line = play_tree_parser_get_line(p);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
270 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
271
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
272 while(line) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
273 strstrip(line);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
274 if(line[0] == '\0') {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
275 line = play_tree_parser_get_line(p);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
276 continue;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
277 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
278 if(strncasecmp(line,"File",4) == 0) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
279 num = pls_read_entry(line+4,&entries,&max_entry,&v);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
280 if(num < 0)
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
281 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
282 else
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
283 entries[num-1].file = strdup(v);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
284 } else if(strncasecmp(line,"Title",5) == 0) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
285 num = pls_read_entry(line+5,&entries,&max_entry,&v);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
286 if(num < 0)
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
287 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
288 else
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
289 entries[num-1].title = strdup(v);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
290 } else if(strncasecmp(line,"Length",6) == 0) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
291 num = pls_read_entry(line+6,&entries,&max_entry,&v);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
292 if(num < 0)
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
293 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
294 else
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
295 entries[num-1].length = strdup(v);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
296 } else
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
297 mp_msg(MSGT_PLAYTREE,MSGL_WARN,"Unknow entry type %s\n",line);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
298 line = play_tree_parser_get_line(p);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
299 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
300
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
301 for(num = 0; num < max_entry ; num++) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
302 if(entries[num].file == NULL)
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
303 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
304 else {
5866
0f5f626e5151 Handle winamp playlist as sublist.
albeu
parents: 5802
diff changeset
305 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
306 entry = play_tree_new();
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
307 play_tree_add_file(entry,entries[num].file);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
308 free(entries[num].file);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
309 if(list)
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
310 play_tree_append_entry(list,entry);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
311 else
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
312 list = entry;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
313 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
314 if(entries[num].title) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
315 // When we have info in playtree we add this info
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
316 free(entries[num].title);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
317 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
318 if(entries[num].length) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
319 // When we have info in playtree we add this info
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
320 free(entries[num].length);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
321 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
322 }
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 free(entries);
5866
0f5f626e5151 Handle winamp playlist as sublist.
albeu
parents: 5802
diff changeset
325
0f5f626e5151 Handle winamp playlist as sublist.
albeu
parents: 5802
diff changeset
326 entry = play_tree_new();
0f5f626e5151 Handle winamp playlist as sublist.
albeu
parents: 5802
diff changeset
327 play_tree_set_child(entry,list);
0f5f626e5151 Handle winamp playlist as sublist.
albeu
parents: 5802
diff changeset
328 return entry;
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
329 }
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
330
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
331 play_tree_t*
6661
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
332 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
333 char* line;
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
334 play_tree_t *list = NULL, *entry = NULL;
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
335
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
336 mp_msg(MSGT_PLAYTREE,MSGL_V,"Trying extended m3u playlist...\n");
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
337 line = play_tree_parser_get_line(p);
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
338 strstrip(line);
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
339 if(strcasecmp(line,"#EXTM3U"))
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
340 return NULL;
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
341 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
342 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
343
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
344 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
345 strstrip(line);
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
346 if(line[0] == '\0')
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
347 continue;
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
348 /* EXTM3U files contain such lines:
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
349 * #EXTINF:<seconds>, <title>
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
350 * 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
351 * 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
352 * 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
353 */
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
354 if(line[0] == '#') {
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
355 #if 0 /* code functional */
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
356 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
357 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
358 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
359 }
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
360 #endif
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
361 continue;
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
362 }
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
363 entry = play_tree_new();
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
364 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
365 if(!list)
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
366 list = entry;
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
367 else
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
368 play_tree_append_entry(list,entry);
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
369 }
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
370
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
371 if(!list) return NULL;
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
372 entry = play_tree_new();
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
373 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
374 return entry;
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
375 }
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
376
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
377 play_tree_t*
4308
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
378 parse_textplain(play_tree_parser_t* p) {
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
379 char* line;
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
380 play_tree_t *list = NULL, *entry = NULL;
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
381
6661
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
382 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
383 play_tree_parser_stop_keeping(p);
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
384
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
385 while((line = play_tree_parser_get_line(p)) != NULL) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
386 strstrip(line);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
387 if(line[0] == '\0')
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
388 continue;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
389 entry = play_tree_new();
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
390 play_tree_add_file(entry,line);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
391 if(!list)
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
392 list = entry;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
393 else
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
394 play_tree_append_entry(list,entry);
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
395 }
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
396
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
397 if(!list) return NULL;
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
398 entry = play_tree_new();
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
399 play_tree_set_child(entry,list);
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
400 return entry;
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
401 }
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
402
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
403 play_tree_t*
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
404 parse_playtree(stream_t *stream) {
4308
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
405 play_tree_parser_t* p;
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
406 play_tree_t* ret;
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
407
4156
22fadd4022b5 playtree-based config patch by Alban Bedel <albeu@free.fr>
arpi
parents: 4043
diff changeset
408 #ifdef MP_DEBUG
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
409 assert(stream != NULL);
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
410 assert(stream->type == STREAMTYPE_PLAYLIST);
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
411 #endif
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
412
4308
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
413 p = play_tree_parser_new(stream,0);
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
414 if(!p)
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
415 return NULL;
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
416
4308
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
417 ret = play_tree_parser_get_play_tree(p);
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
418 play_tree_parser_free(p);
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
419
4308
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
420 return ret;
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
421 }
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
422
6662
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
423 static void
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
424 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
425 int i,bl = strlen(bp),fl;
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
426
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
427 if(pt->child) {
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
428 play_tree_t* i;
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
429 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
430 play_tree_add_basepath(i,bp);
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
431 return;
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
432 }
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
433
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
434 if(!pt->files)
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
435 return;
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
436
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
437 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
438 fl = strlen(pt->files[i]);
6663
5790a2576505 10L don't add a base path to the urls
albeu
parents: 6662
diff changeset
439 if(fl <= 0 || pt->files[i][0] == PATH_SEP || strstr(pt->files[i],"://"))
6662
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
440 continue;
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
441 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
442 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
443 memcpy(pt->files[i],bp,bl);
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
444 }
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
445 }
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
446
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
447 play_tree_t*
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
448 parse_playlist_file(char* file) {
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
449 stream_t *stream;
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
450 play_tree_t* ret;
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
451 int fd;
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
452
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
453 if(!strcmp(file,"-"))
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
454 fd = 0;
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
455 else
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
456 fd = open(file,O_RDONLY);
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
457
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
458 if(fd < 0) {
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
459 mp_msg(MSGT_PLAYTREE,MSGL_ERR,"Error while opening playlist file %s : %s\n",file,strerror(errno));
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
460 return NULL;
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
461 }
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
462
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
463 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
464
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
465 stream = new_stream(fd,STREAMTYPE_PLAYLIST);
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
466 ret = parse_playtree(stream);
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
467 if(close(fd) < 0)
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
468 mp_msg(MSGT_PLAYTREE,MSGL_ERR,"Warning error while closing playlist file %s : %s\n",file,strerror(errno));
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
469 free_stream(stream);
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
470
6662
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
471 if(ret) {
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
472 char* ls = strrchr(file,PATH_SEP);
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
473 if(ls) {
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
474 ls[1] = '\0';
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
475 play_tree_add_basepath(ret,file);
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
476 }
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
477 }
f8e25756a5ec Relative filename in playlist are now relative to the playlist path
albeu
parents: 6661
diff changeset
478
4043
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
479 return ret;
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
480
25590564842f tree-based playlist parser code by Alban Bedel <albeu@free.fr>
arpi
parents:
diff changeset
481 }
4308
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
482
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
483
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
484 play_tree_parser_t*
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
485 play_tree_parser_new(stream_t* stream,int deep) {
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
486 play_tree_parser_t* p;
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
487
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
488 p = (play_tree_parser_t*)calloc(1,sizeof(play_tree_parser_t));
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
489 if(!p)
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
490 return NULL;
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
491 p->stream = stream;
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
492 p->deep = deep;
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
493 p->keep = 1;
4308
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
494
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
495 return p;
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
496
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
497 }
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
498
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
499 void
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
500 play_tree_parser_free(play_tree_parser_t* p) {
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
501
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
502 #ifdef MP_DEBUG
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
503 assert(p != NULL);
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
504 #endif
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
505
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
506 if(p->buffer) free(p->buffer);
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
507 if(p->line) free(p->line);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
508 free(p);
4308
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
509 }
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
510
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
511 play_tree_t*
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
512 play_tree_parser_get_play_tree(play_tree_parser_t* p) {
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
513 play_tree_t* tree = NULL;
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
514
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
515 #ifdef MP_DEBUG
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
516 assert(p != NULL);
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
517 #endif
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
518
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
519
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
520 while(play_tree_parser_get_line(p) != NULL) {
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
521 play_tree_parser_reset(p);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
522
4308
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
523 tree = parse_asx(p);
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
524 if(tree) break;
4782
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
525 play_tree_parser_reset(p);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
526
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
527 tree = parse_pls(p);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
528 if(tree) break;
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
529 play_tree_parser_reset(p);
4b728967bd77 Playtree parser switch to a by line mode.
albeu
parents: 4714
diff changeset
530
6661
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
531 tree = parse_m3u(p);
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
532 if(tree) break;
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
533 play_tree_parser_reset(p);
dc61b6b159e4 Add support for m3u playlists as generated by eg recent versions of winamp.
atmos4
parents: 5866
diff changeset
534
4308
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
535 // Here come the others formats ( textplain must stay the last one )
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
536 tree = parse_textplain(p);
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
537 if(tree) break;
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
538 break;
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
539 }
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
540
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
541 if(tree)
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
542 mp_msg(MSGT_PLAYTREE,MSGL_V,"Playlist succefully parsed\n");
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
543 else mp_msg(MSGT_PLAYTREE,MSGL_ERR,"Error while parsing playlist\n");
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
544
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
545 if(tree)
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
546 tree = play_tree_cleanup(tree);
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
547
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
548 if(!tree) mp_msg(MSGT_PLAYTREE,MSGL_WARN,"Warning empty playlist\n");
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
549
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
550 return tree;
d752f99fd535 Objectization of the play_tree_parser for more flexiblity
albeu
parents: 4156
diff changeset
551 }