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

stupid database version error

Browse Source
This commit is contained in:
Ron Pedde 2005-06-08 04:55:24 +00:00
parent f61fbb60b3
commit 5c3e37e564
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mp3-scanner.c
View File

@ -58,11 +58,6 @@
/* /*
* Typedefs * Typedefs
*/ */
/*
* Typedefs
*/
typedef struct { typedef struct {
char *suffix; char *suffix;
int (*scanner)(char* file, MP3FILE* pmp3); int (*scanner)(char* file, MP3FILE* pmp3);
@ -71,6 +66,7 @@ typedef struct {
char *description; /* daap.songdescription */ char *description; /* daap.songdescription */
} TAGHANDLER; } TAGHANDLER;
#define MAYBEFREE(a) { if((a)) free((a)); }; #define MAYBEFREE(a) { if((a)) free((a)); };
@ -80,9 +76,7 @@ typedef struct {
static int scan_path(char *path); static int scan_path(char *path);
static int scan_get_info(char *file, MP3FILE *pmp3); static int scan_get_info(char *file, MP3FILE *pmp3);
static int scan_freetags(MP3FILE *pmp3); static int scan_freetags(MP3FILE *pmp3);
static int scan_static_playlist(char *path);
static void scan_music_file(char *path, struct dirent *pde, struct stat *psb); static void scan_music_file(char *path, struct dirent *pde, struct stat *psb);
static TAGHANDLER *scan_gethandler(char *type); static TAGHANDLER *scan_gethandler(char *type);
@ -103,7 +97,8 @@ extern int scan_get_urlinfo(char *filename, MP3FILE *pmp3);
extern int scan_get_mp3info(char *filename, MP3FILE *pmp3); extern int scan_get_mp3info(char *filename, MP3FILE *pmp3);
/* playlist scanners */ /* playlist scanners */
int scan_xml_playlist(char *filename); extern int scan_xml_playlist(char *filename);
static int scan_static_playlist(char *path);
/* For known types, I'm gong to use the "official" apple /* For known types, I'm gong to use the "official" apple
* daap.songformat, daap.songdescription, and daap.songcodecsubtype. * daap.songformat, daap.songdescription, and daap.songcodecsubtype.

4
src/scan-mp3.c
View File

@ -306,6 +306,8 @@ int scan_mp3_get_mp3tags(char *file, MP3FILE *pmp3) {
return FALSE; return FALSE;
} }
DPRINTF(E_SPAM,L_SCAN,"Starting mp3 tag scan\n");
index=0; index=0;
while((pid3frame=id3_tag_findframe(pid3tag,"",index))) { while((pid3frame=id3_tag_findframe(pid3tag,"",index))) {
used=0; used=0;
@ -314,6 +316,8 @@ int scan_mp3_get_mp3tags(char *file, MP3FILE *pmp3) {
have_utf8=0; have_utf8=0;
have_text=0; have_text=0;
DPRINTF(E_SPAM,L_SCAN,"Found tag %s\n",pid3frame->id);
if(!strcmp(pid3frame->id,"YTCP")) { /* for id3v2.2 */ if(!strcmp(pid3frame->id,"YTCP")) { /* for id3v2.2 */
pmp3->compilation = 1; pmp3->compilation = 1;
DPRINTF(E_DBG,L_SCAN,"Compilation: %d\n", pmp3->compilation); DPRINTF(E_DBG,L_SCAN,"Compilation: %d\n", pmp3->compilation);