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

Fix fpos_t thing

This commit is contained in:
Ron Pedde 2003-11-14 19:19:29 +00:00
parent a01e46d961
commit 9bc76676b3
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mp3-scanner.c
View File

@ -181,6 +181,7 @@ int scan_gettags(char *file, MP3FILE *pmp3) {
pid3file=id3_file_open(file,ID3_FILE_MODE_READONLY); pid3file=id3_file_open(file,ID3_FILE_MODE_READONLY);
if(!pid3file) { if(!pid3file) {
DPRINTF(ERR_WARN,"Cannot open %s\n",file);
return -1; return -1;
} }
@ -190,6 +191,7 @@ int scan_gettags(char *file, MP3FILE *pmp3) {
err=errno; err=errno;
id3_file_close(pid3file); id3_file_close(pid3file);
errno=err; errno=err;
DPRINTF(ERR_WARN,"Cannot get ID3 tag for %s\n",file);
return -1; return -1;
} }
@ -231,6 +233,8 @@ int scan_gettags(char *file, MP3FILE *pmp3) {
pmp3->got_id3=1; pmp3->got_id3=1;
id3_file_close(pid3file); id3_file_close(pid3file);
DPRINTF(ERR_DEBUG,"Got id3 tag successfully\n");
return 0;
} }
/* /*
@ -261,8 +265,8 @@ int scan_getfileinfo(char *file, MP3FILE *pmp3) {
FILE *infile; FILE *infile;
SCAN_ID3HEADER *pid3; SCAN_ID3HEADER *pid3;
unsigned int size=0; unsigned int size=0;
long fp_size; fpos_t fp_size=0;
long file_size; fpos_t file_size;
unsigned char buffer[256]; unsigned char buffer[256];
int time_seconds; int time_seconds;
@ -281,9 +285,11 @@ int scan_getfileinfo(char *file, MP3FILE *pmp3) {
if(strncmp(pid3->id,"ID3",3)==0) { if(strncmp(pid3->id,"ID3",3)==0) {
/* found an ID3 header... */ /* found an ID3 header... */
DPRINTF(ERR_DEBUG,"Found ID3 header\n");
size = (pid3->size[0] << 21 | pid3->size[1] << 14 | size = (pid3->size[0] << 21 | pid3->size[1] << 14 |
pid3->size[2] << 7 | pid3->size[3]); pid3->size[2] << 7 | pid3->size[3]);
fp_size=size + sizeof(SCAN_ID3HEADER); fp_size=(fpos_t)(size + sizeof(SCAN_ID3HEADER));
DPRINTF(ERR_DEBUG,"Header length: %d\n",size);
} }
fseek(infile,0,SEEK_END); fseek(infile,0,SEEK_END);
@ -315,6 +321,7 @@ int scan_getfileinfo(char *file, MP3FILE *pmp3) {
pmp3->samplerate=samplerate; pmp3->samplerate=samplerate;
} else { } else {
/* not an mp3... */ /* not an mp3... */
DPRINTF(ERR_DEBUG,"File is not a MPEG-1/Layer III\n");
return -1; return -1;
} }
@ -325,6 +332,7 @@ int scan_getfileinfo(char *file, MP3FILE *pmp3) {
} else { } else {
/* should really scan forward to next sync frame */ /* should really scan forward to next sync frame */
fclose(infile); fclose(infile);
DPRINTF(ERR_DEBUG,"Could not find sync frame\n");
return -1; return -1;
} }