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

don't translate comments from utf8

Browse Source
This commit is contained in:
Ron Pedde 2004-01-13 04:30:32 +00:00
parent 5dca8dcbf2
commit 09e9f8c571
1 changed files with 46 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/mp3-scanner.c
View File

@ -19,6 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#define _POSIX_PTHREAD_SEMANTICS
#include <dirent.h> #include <dirent.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
@ -276,6 +277,7 @@ int scan_foreground(char *path) {
while(1) { while(1) {
pde=&de; pde=&de;
err=readdir_r(current_dir,&de,&pde); err=readdir_r(current_dir,&de,&pde);
if(err == -1) { if(err == -1) {
DPRINTF(ERR_DEBUG,"Error on readdir_r: %s\n",strerror(errno)); DPRINTF(ERR_DEBUG,"Error on readdir_r: %s\n",strerror(errno));
@ -288,7 +290,7 @@ int scan_foreground(char *path) {
if(!pde) if(!pde)
break; break;
if(de.d_name[0] == '.') if(de.d_name[0] == '.') /* skip hidden and directories */
continue; continue;
sprintf(mp3_path,"%s/%s",path,de.d_name); sprintf(mp3_path,"%s/%s",path,de.d_name);
@ -379,6 +381,7 @@ int scan_foreground(char *path) {
} }
closedir(current_dir); closedir(current_dir);
return 0;
} }
/* /*
@ -395,6 +398,7 @@ int scan_gettags(char *file, MP3FILE *pmp3) {
int used; int used;
unsigned char *utf8_text; unsigned char *utf8_text;
int genre; int genre;
int have_utf8;
pid3file=id3_file_open(file,ID3_FILE_MODE_READONLY); pid3file=id3_file_open(file,ID3_FILE_MODE_READONLY);
if(!pid3file) { if(!pid3file) {
@ -416,11 +420,15 @@ int scan_gettags(char *file, MP3FILE *pmp3) {
while((pid3frame=id3_tag_findframe(pid3tag,"",index))) { while((pid3frame=id3_tag_findframe(pid3tag,"",index))) {
used=0; used=0;
utf8_text=NULL; utf8_text=NULL;
have_utf8=0;
if((pid3frame->id[0] == 'T')&&(id3_field_getnstrings(&pid3frame->fields[1]))) { if((pid3frame->id[0] == 'T')&&(id3_field_getnstrings(&pid3frame->fields[1])))
have_utf8=1;
if(have_utf8) {
utf8_text=id3_ucs4_utf8duplicate(id3_field_getstrings(&pid3frame->fields[1],0)); utf8_text=id3_ucs4_utf8duplicate(id3_field_getstrings(&pid3frame->fields[1],0));
if(utf8_text) {
MEMNOTIFY(utf8_text); MEMNOTIFY(utf8_text);
}
if(!strcmp(pid3frame->id,"TIT2")) { /* Title */ if(!strcmp(pid3frame->id,"TIT2")) { /* Title */
used=1; used=1;
@ -443,16 +451,22 @@ int scan_gettags(char *file, MP3FILE *pmp3) {
free(pmp3->genre); free(pmp3->genre);
pmp3->genre=strdup(scan_winamp_genre[genre]); pmp3->genre=strdup(scan_winamp_genre[genre]);
} }
} else if(!strcmp(pid3frame->id,"COMM")) {
used=1;
pmp3->comment = utf8_text;
DPRINTF(ERR_DEBUG," Comment: %s\n",utf8_text);
} else if(!strcmp(pid3frame->id,"TDRC")) { } else if(!strcmp(pid3frame->id,"TDRC")) {
pmp3->year = atoi(utf8_text); pmp3->year = atoi(utf8_text);
DPRINTF(ERR_DEBUG," Year: %d\n",pmp3->year); DPRINTF(ERR_DEBUG," Year: %d\n",pmp3->year);
} }
}
}
if((!used) && (pid3frame->id[0]=='T') && (utf8_text))
if((!strcmp(pid3frame->id,"COMM"))&&(id3_field_getnstrings(&pid3frame->fields[1]))) {
pmp3->comment=strdup(id3_field_getstrings(&pid3frame->fields[1],0));
DPRINTF(ERR_DEBUG," Comment: %s\n",pmp3->comment);
}
/* can check for non-utf tags here */
if((!used) && (have_utf8) && (utf8_text))
free(utf8_text); free(utf8_text);
index++; index++;