MyFavMirrors
/
owntone-server
mirror of https://github.com/owntone/owntone-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix genre bugs in aac and mp3

This commit is contained in:
Ron Pedde 2004-03-14 21:37:07 +00:00
parent 6795f24fae
commit c82841a551
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/mp3-scanner.c
View File

@ -499,6 +499,7 @@ int scan_get_aactags(char *file, MP3FILE *pmp3) {
char current_atom[4]; char current_atom[4];
char *current_data; char *current_data;
unsigned short us_data; unsigned short us_data;
int genre;
int len; int len;
if(!(fin=fopen(file,"rb"))) { if(!(fin=fopen(file,"rb"))) {
@ -574,6 +575,14 @@ int scan_get_aactags(char *file, MP3FILE *pmp3) {
pmp3->total_discs=us_data; pmp3->total_discs=us_data;
} else if(!memcmp(current_atom,"\xA9" "day",4)) { } else if(!memcmp(current_atom,"\xA9" "day",4)) {
pmp3->year=atoi((char*)&current_data[16]); pmp3->year=atoi((char*)&current_data[16]);
} else if(!memcmp(current_atom,"gnre",4)) {
genre=(int)(*((char*)&current_data[17]));
genre--;
if((genre < 0) || (genre > WINAMP_GENRE_UNKNOWN))
genre=WINAMP_GENRE_UNKNOWN;
pmp3->genre=strdup(scan_winamp_genre[genre]);
} }
free(current_data); free(current_data);
@ -639,6 +648,7 @@ int scan_get_mp3tags(char *file, MP3FILE *pmp3) {
int have_text; int have_text;
id3_ucs4_t const *native_text; id3_ucs4_t const *native_text;
char *tmp; char *tmp;
int got_numeric_genre;
if(strcasecmp(pmp3->type,".mp3")) /* can't get tags for non-mp3 */ if(strcasecmp(pmp3->type,".mp3")) /* can't get tags for non-mp3 */
return 0; return 0;
@ -694,20 +704,26 @@ int scan_get_mp3tags(char *file, MP3FILE *pmp3) {
} else if(!strcmp(pid3frame->id,"TCON")) { } else if(!strcmp(pid3frame->id,"TCON")) {
used=1; used=1;
pmp3->genre = utf8_text; pmp3->genre = utf8_text;
got_numeric_genre=0;
DPRINTF(ERR_DEBUG," Genre: %s\n",utf8_text); DPRINTF(ERR_DEBUG," Genre: %s\n",utf8_text);
if(pmp3->genre) { if(pmp3->genre) {
if(!strlen(pmp3->genre)) { if(!strlen(pmp3->genre)) {
genre=WINAMP_GENRE_UNKNOWN; genre=WINAMP_GENRE_UNKNOWN;
got_numeric_genre=1;
} else if (isdigit(pmp3->genre[0])) { } else if (isdigit(pmp3->genre[0])) {
genre=atoi(pmp3->genre); genre=atoi(pmp3->genre);
got_numeric_genre=1;
} else if ((pmp3->genre[0] == '(') && (isdigit(pmp3->genre[1]))) { } else if ((pmp3->genre[0] == '(') && (isdigit(pmp3->genre[1]))) {
genre=atoi((char*)&pmp3->genre[1]); genre=atoi((char*)&pmp3->genre[1]);
} got_numeric_genre=1;
}
if((genre < 0) || (genre > WINAMP_GENRE_UNKNOWN)) if(got_numeric_genre) {
genre=WINAMP_GENRE_UNKNOWN; if((genre < 0) || (genre > WINAMP_GENRE_UNKNOWN))
free(pmp3->genre); genre=WINAMP_GENRE_UNKNOWN;
pmp3->genre=strdup(scan_winamp_genre[genre]); free(pmp3->genre);
pmp3->genre=strdup(scan_winamp_genre[genre]);
}
} }
} else if(!strcmp(pid3frame->id,"COMM")) { } else if(!strcmp(pid3frame->id,"COMM")) {
used=1; used=1;