RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-26 13:19:12 +00:00
Code Issues Releases Wiki Activity

Fix the incredible slowness with very long list. Now a 10^6 entries

Browse Source 
list take ~1 sec instead of several minutes.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9790 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
albeu 2003-04-02 15:32:12 +00:00
parent c980c302fb
commit ac1ed6d086
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
playtreeparser.c
View File

@ -248,7 +248,7 @@ parse_pls(play_tree_parser_t* p) {
char *line,*v; char *line,*v;
pls_entry_t* entries = NULL; pls_entry_t* entries = NULL;
int n_entries = 0,max_entry=0,num; int n_entries = 0,max_entry=0,num;
play_tree_t *list = NULL, *entry = NULL; play_tree_t *list = NULL, *entry = NULL, *last_entry = NULL;
mp_msg(MSGT_PLAYTREE,MSGL_V,"Trying winamp playlist...\n"); mp_msg(MSGT_PLAYTREE,MSGL_V,"Trying winamp playlist...\n");
if (!(line = play_tree_parser_get_line(p))) if (!(line = play_tree_parser_get_line(p)))
@ -310,9 +310,10 @@ parse_pls(play_tree_parser_t* p) {
play_tree_add_file(entry,entries[num].file); play_tree_add_file(entry,entries[num].file);
free(entries[num].file); free(entries[num].file);
if(list) if(list)
play_tree_append_entry(list,entry); play_tree_append_entry(last_entry,entry);
else else
list = entry; list = entry;
last_entry = entry;
} }
if(entries[num].title) { if(entries[num].title) {
// When we have info in playtree we add this info // When we have info in playtree we add this info
@ -337,7 +338,7 @@ parse_pls(play_tree_parser_t* p) {
play_tree_t* play_tree_t*
parse_ref_ini(play_tree_parser_t* p) { parse_ref_ini(play_tree_parser_t* p) {
char *line,*v; char *line,*v;
play_tree_t *list = NULL, *entry = NULL; play_tree_t *list = NULL, *entry = NULL, *last_entry = NULL;
mp_msg(MSGT_PLAYTREE,MSGL_V,"Trying reference-ini playlist...\n"); mp_msg(MSGT_PLAYTREE,MSGL_V,"Trying reference-ini playlist...\n");
if (!(line = play_tree_parser_get_line(p))) if (!(line = play_tree_parser_get_line(p)))
@ -362,9 +363,10 @@ parse_ref_ini(play_tree_parser_t* p) {
entry = play_tree_new(); entry = play_tree_new();
play_tree_add_file(entry,v); play_tree_add_file(entry,v);
if(list) if(list)
play_tree_append_entry(list,entry); play_tree_append_entry(last_entry,entry);
else else
list = entry; list = entry;
last_entry = entry;
} }
} }
line = play_tree_parser_get_line(p); line = play_tree_parser_get_line(p);
@ -379,7 +381,7 @@ parse_ref_ini(play_tree_parser_t* p) {
play_tree_t* play_tree_t*
parse_m3u(play_tree_parser_t* p) { parse_m3u(play_tree_parser_t* p) {
char* line; char* line;
play_tree_t *list = NULL, *entry = NULL; play_tree_t *list = NULL, *entry = NULL, *last_entry = NULL;
mp_msg(MSGT_PLAYTREE,MSGL_V,"Trying extended m3u playlist...\n"); mp_msg(MSGT_PLAYTREE,MSGL_V,"Trying extended m3u playlist...\n");
if (!(line = play_tree_parser_get_line(p))) if (!(line = play_tree_parser_get_line(p)))
@ -414,7 +416,8 @@ parse_m3u(play_tree_parser_t* p) {
if(!list) if(!list)
list = entry; list = entry;
else else
play_tree_append_entry(list,entry); play_tree_append_entry(last_entry,entry);
last_entry = entry;
} }
if(!list) return NULL; if(!list) return NULL;
@ -426,7 +429,7 @@ parse_m3u(play_tree_parser_t* p) {
play_tree_t* play_tree_t*
parse_textplain(play_tree_parser_t* p) { parse_textplain(play_tree_parser_t* p) {
char* line; char* line;
play_tree_t *list = NULL, *entry = NULL; play_tree_t *list = NULL, *entry = NULL, *last_entry = NULL;
mp_msg(MSGT_PLAYTREE,MSGL_V,"Trying plaintext playlist...\n"); mp_msg(MSGT_PLAYTREE,MSGL_V,"Trying plaintext playlist...\n");
play_tree_parser_stop_keeping(p); play_tree_parser_stop_keeping(p);
@ -440,7 +443,8 @@ parse_textplain(play_tree_parser_t* p) {
if(!list) if(!list)
list = entry; list = entry;
else else
play_tree_append_entry(list,entry); play_tree_append_entry(last_entry,entry);
last_entry = entry;
} }
if(!list) return NULL; if(!list) return NULL;