MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-04-17 01:20:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove support for iTunes XML playlist

Browse Source 
No plans for OS X nor Windows in the near future, and those are most
probably useless on other platforms.
This commit is contained in:
Julien BLACHE 2009-04-20 16:47:03 +02:00
parent 831016bb05
commit 69d6acad37
3 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/filescanner.c
View File

@ -312,7 +312,6 @@ static void
process_playlist(char *file) process_playlist(char *file)
{ {
char *ext; char *ext;
char *filename;
ext = strrchr(file, '.'); ext = strrchr(file, '.');
if (ext) if (ext)
@ -321,19 +320,6 @@ process_playlist(char *file)
{ {
scan_m3u_playlist(file); scan_m3u_playlist(file);
return;
}
}
filename = strrchr(file, '/');
if (filename)
{
filename++;
if ((strcmp(filename, "iTunes Music Library.xml") == 0)
|| (strcmp(filename, "iTunes Library.xml") == 0))
{
scan_xml_playlist(file);
return; return;
} }
} }
@ -396,8 +382,7 @@ process_file(char *file, time_t mtime, off_t size, int compilation, int bulk)
ext = strrchr(file, '.'); ext = strrchr(file, '.');
if (ext) if (ext)
{ {
if ((strcmp(ext, ".m3u") == 0) if (strcmp(ext, ".m3u") == 0)
|| (strcmp(ext, ".xml") == 0))
{ {
if (bulk) if (bulk)
defer_playlist(file); defer_playlist(file);

3
src/filescanner.h
View File

@ -17,9 +17,6 @@ scan_get_ffmpeginfo(char *filename, struct media_file_info *mfi);
int int
scan_get_urlinfo(char *filename, struct media_file_info *mfi); scan_get_urlinfo(char *filename, struct media_file_info *mfi);
int
scan_xml_playlist(char *filename);
int int
scan_static_playlist(char *filename); scan_static_playlist(char *filename);

10
src/mp3-scanner.c
View File

@ -74,7 +74,6 @@ extern int scan_get_urlinfo(char *filename, MP3FILE *pmp3);
extern int scan_get_ffmpeginfo(char *filename, struct media_file_info *mfi); extern int scan_get_ffmpeginfo(char *filename, struct media_file_info *mfi);
/* playlist scanners */ /* playlist scanners */
extern int scan_xml_playlist(char *filename);
int scan_static_playlist(char *path); int scan_static_playlist(char *path);
@ -142,14 +141,7 @@ void scan_process_playlistlist(void) {
file = strrchr(pnext->path,PATHSEP) + 1; file = strrchr(pnext->path,PATHSEP) + 1;
} }
if((!strcasecmp(file,"iTunes Music Library.xml")) || if(!strcasecmp(ext,".m3u")) {
(!strcasecmp(file,"iTunes Library.xml"))) {
if(conf_get_int("scanning","process_itunes",1)) {
DPRINTF(E_INF,L_SCAN,"Scanning %s\n",pnext->path);
scan_xml_playlist(pnext->path);
DPRINTF(E_INF,L_SCAN,"Done Scanning %s\n",pnext->path);
}
} else if(!strcasecmp(ext,".m3u")) {
if(conf_get_int("scanning","process_m3u",0)) { if(conf_get_int("scanning","process_m3u",0)) {
DPRINTF(E_INF,L_SCAN,"Scanning %s\n",pnext->path); DPRINTF(E_INF,L_SCAN,"Scanning %s\n",pnext->path);
scan_static_playlist(pnext->path); scan_static_playlist(pnext->path);