Mercurial > audlegacy

comparison audacious/playlist.c @ 1165:6fe822f5a3c0 trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] - make it work for real
author nenolod
date Sat, 10 Jun 2006 21:44:36 -0700
parents ff71f891265b
children 56b57ed0a136
comparison
equal deleted inserted replaced
1164:ea95c89c92ee 1165:6fe822f5a3c0
506 if (is_playlist_name(filename)) { 506 if (is_playlist_name(filename)) {
507 playlist_load_ins(filename, pos); 507 playlist_load_ins(filename, pos);
508 return TRUE; 508 return TRUE;
509 } 509 }
510 510
511 if (loading_playlist == TRUE || cfg.playlist_detect == FALSE) 511 if (loading_playlist == TRUE || cfg.playlist_detect == TRUE)
512 dec = NULL; 512 dec = NULL;
513 else 513 else
514 dec = input_check_file(filename, TRUE); 514 dec = input_check_file(filename, TRUE);
515 515
516 if (cfg.playlist_detect == FALSE || loading_playlist == TRUE || (loading_playlist == FALSE && dec != NULL)) 516 if (cfg.playlist_detect == TRUE || loading_playlist == TRUE || (loading_playlist == FALSE && dec != NULL))
517 { 517 {
518 __playlist_ins(filename, pos, dec); 518 __playlist_ins(filename, pos, dec);
519 playlist_generate_shuffle_list(); 519 playlist_generate_shuffle_list();
520 playlistwin_update_list(); 520 playlistwin_update_list();
521 return TRUE; 521 return TRUE;
658 GList *sub; 658 GList *sub;
659 sub = playlist_dir_find_files(filename, background, htab); 659 sub = playlist_dir_find_files(filename, background, htab);
660 g_free(filename); 660 g_free(filename);
661 list = g_list_concat(list, sub); 661 list = g_list_concat(list, sub);
662 } 662 }
663 else if (cfg.playlist_detect == TRUE)
664 list = g_list_prepend(list, filename);
663 else if (input_check_file(filename, TRUE)) 665 else if (input_check_file(filename, TRUE))
664 list = g_list_prepend(list, filename); 666 list = g_list_prepend(list, filename);
665 else 667 else
666 g_free(filename); 668 g_free(filename);
667 669
1383 __playlist_ins_with_info(filename, pos, title, len, dec); 1385 __playlist_ins_with_info(filename, pos, title, len, dec);
1384 return; 1386 return;
1385 } 1387 }
1386 tmp = g_build_filename(path, filename, NULL); 1388 tmp = g_build_filename(path, filename, NULL);
1387 1389
1388 if (loading_playlist != TRUE || cfg.playlist_detect == FALSE) 1390 if (loading_playlist != TRUE && cfg.playlist_detect != TRUE)
1389 dec = input_check_file(tmp, FALSE); 1391 dec = input_check_file(tmp, FALSE);
1390 else 1392 else
1391 dec = NULL; 1393 dec = NULL;
1392 1394
1393 __playlist_ins_with_info(tmp, pos, title, len, dec); 1395 __playlist_ins_with_info(tmp, pos, title, len, dec);
1394 g_free(tmp); 1396 g_free(tmp);
1395 g_free(path); 1397 g_free(path);
1396 } 1398 }
1397 else 1399 else
1398 { 1400 {
1399 if (loading_playlist != TRUE || cfg.playlist_detect == FALSE) 1401 if (loading_playlist != TRUE && cfg.playlist_detect != TRUE)
1400 dec = input_check_file(filename, FALSE); 1402 dec = input_check_file(filename, FALSE);
1401 else 1403 else
1402 dec = NULL; 1404 dec = NULL;
1403 1405
1404 __playlist_ins_with_info(filename, pos, title, len, dec); 1406 __playlist_ins_with_info(filename, pos, title, len, dec);