devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Make get_metadata act on a struct mp3entry rather than a struct track_info.

Browse source 
This should make it easy to use a buffer handle to put the ID3 data in.
The changes in get_metadata are mostly search and replace. The only thing
it actually used to do on the struct track_info was set taginfo_ready to
true.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14326 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nicolas Pennequin 2007-08-14 11:56:13 +00:00
parent 7b055ab665
commit 6a92e475ac
6 changed files with 50 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

85
apps/metadata.c
View file

@ -93,7 +93,7 @@ unsigned int probe_file_format(const char *filename)
/* Get metadata for track - return false if parsing showed problems with the /* Get metadata for track - return false if parsing showed problems with the
* file that would prevent playback. * file that would prevent playback.
*/ */
bool get_metadata(struct track_info* track, int fd, const char* trackname, bool get_metadata(struct mp3entry* id3, int fd, const char* trackname,
bool v1first) bool v1first)
{ {
#if CONFIG_CODEC == SWCODEC #if CONFIG_CODEC == SWCODEC
@ -103,15 +103,15 @@ bool get_metadata(struct track_info* track, int fd, const char* trackname,
#endif #endif
/* Take our best guess at the codec type based on file extension */ /* Take our best guess at the codec type based on file extension */
track->id3.codectype = probe_file_format(trackname); id3->codectype = probe_file_format(trackname);
/* Load codec specific track tag information and confirm the codec type. */ /* Load codec specific track tag information and confirm the codec type. */
switch (track->id3.codectype) switch (id3->codectype)
{ {
case AFMT_MPA_L1: case AFMT_MPA_L1:
case AFMT_MPA_L2: case AFMT_MPA_L2:
case AFMT_MPA_L3: case AFMT_MPA_L3:
if (!get_mp3_metadata(fd, &track->id3, trackname, v1first)) if (!get_mp3_metadata(fd, id3, trackname, v1first))
{ {
return false; return false;
} }
@ -120,7 +120,7 @@ bool get_metadata(struct track_info* track, int fd, const char* trackname,
#if CONFIG_CODEC == SWCODEC #if CONFIG_CODEC == SWCODEC
case AFMT_FLAC: case AFMT_FLAC:
if (!get_flac_metadata(fd, &(track->id3))) if (!get_flac_metadata(fd, id3))
{ {
return false; return false;
} }
@ -128,28 +128,28 @@ bool get_metadata(struct track_info* track, int fd, const char* trackname,
break; break;
case AFMT_WMA: case AFMT_WMA:
if (!get_asf_metadata(fd, &(track->id3))) if (!get_asf_metadata(fd, id3))
{ {
return false; return false;
} }
break; break;
case AFMT_APE: case AFMT_APE:
if (!get_monkeys_metadata(fd, &(track->id3))) if (!get_monkeys_metadata(fd, id3))
{ {
return false; return false;
} }
read_ape_tags(fd, &(track->id3)); read_ape_tags(fd, id3);
break; break;
case AFMT_MPC: case AFMT_MPC:
if (!get_musepack_metadata(fd, &(track->id3))) if (!get_musepack_metadata(fd, id3))
return false; return false;
read_ape_tags(fd, &(track->id3)); read_ape_tags(fd, id3);
break; break;
case AFMT_OGG_VORBIS: case AFMT_OGG_VORBIS:
if (!get_vorbis_metadata(fd, &(track->id3)))/*detects and handles Ogg/Speex files*/ if (!get_vorbis_metadata(fd, id3))/*detects and handles Ogg/Speex files*/
{ {
return false; return false;
} }
@ -157,7 +157,7 @@ bool get_metadata(struct track_info* track, int fd, const char* trackname,
break; break;
case AFMT_SPEEX: case AFMT_SPEEX:
if (!get_speex_metadata(fd, &(track->id3))) if (!get_speex_metadata(fd, id3))
{ {
return false; return false;
} }
@ -165,7 +165,7 @@ bool get_metadata(struct track_info* track, int fd, const char* trackname,
break; break;
case AFMT_PCM_WAV: case AFMT_PCM_WAV:
if (!get_wave_metadata(fd, &(track->id3))) if (!get_wave_metadata(fd, id3))
{ {
return false; return false;
} }
@ -173,15 +173,15 @@ bool get_metadata(struct track_info* track, int fd, const char* trackname,
break; break;
case AFMT_WAVPACK: case AFMT_WAVPACK:
if (!get_wavpack_metadata(fd, &(track->id3))) if (!get_wavpack_metadata(fd, id3))
return false; return false;
read_ape_tags(fd, &track->id3); /* use any apetag info we find */ read_ape_tags(fd, id3); /* use any apetag info we find */
break; break;
case AFMT_A52: case AFMT_A52:
/* Use the trackname part of the id3 structure as a temporary buffer */ /* Use the trackname part of the id3 structure as a temporary buffer */
buf = (unsigned char *)track->id3.path; buf = (unsigned char *)id3->path;
if ((lseek(fd, 0, SEEK_SET) < 0) || (read(fd, buf, 5) < 5)) if ((lseek(fd, 0, SEEK_SET) < 0) || (read(fd, buf, 5) < 5))
{ {
@ -202,25 +202,25 @@ bool get_metadata(struct track_info* track, int fd, const char* trackname,
return false; return false;
} }
track->id3.bitrate = a52_bitrates[i >> 1]; id3->bitrate = a52_bitrates[i >> 1];
track->id3.vbr = false; id3->vbr = false;
track->id3.filesize = filesize(fd); id3->filesize = filesize(fd);
switch (buf[4] & 0xc0) switch (buf[4] & 0xc0)
{ {
case 0x00: case 0x00:
track->id3.frequency = 48000; id3->frequency = 48000;
track->id3.bytesperframe=track->id3.bitrate * 2 * 2; id3->bytesperframe=id3->bitrate * 2 * 2;
break; break;
case 0x40: case 0x40:
track->id3.frequency = 44100; id3->frequency = 44100;
track->id3.bytesperframe = a52_441framesizes[i]; id3->bytesperframe = a52_441framesizes[i];
break; break;
case 0x80: case 0x80:
track->id3.frequency = 32000; id3->frequency = 32000;
track->id3.bytesperframe = track->id3.bitrate * 3 * 2; id3->bytesperframe = id3->bitrate * 3 * 2;
break; break;
default: default:
@ -230,13 +230,13 @@ bool get_metadata(struct track_info* track, int fd, const char* trackname,
} }
/* One A52 frame contains 6 blocks, each containing 256 samples */ /* One A52 frame contains 6 blocks, each containing 256 samples */
totalsamples = track->id3.filesize / track->id3.bytesperframe * 6 * 256; totalsamples = id3->filesize / id3->bytesperframe * 6 * 256;
track->id3.length = totalsamples / track->id3.frequency * 1000; id3->length = totalsamples / id3->frequency * 1000;
break; break;
case AFMT_ALAC: case AFMT_ALAC:
case AFMT_AAC: case AFMT_AAC:
if (!get_mp4_metadata(fd, &(track->id3))) if (!get_mp4_metadata(fd, id3))
{ {
return false; return false;
} }
@ -244,9 +244,9 @@ bool get_metadata(struct track_info* track, int fd, const char* trackname,
break; break;
case AFMT_SHN: case AFMT_SHN:
track->id3.vbr = true; id3->vbr = true;
track->id3.filesize = filesize(fd); id3->filesize = filesize(fd);
if (!skip_id3v2(fd, &(track->id3))) if (!skip_id3v2(fd, id3))
{ {
return false; return false;
} }
@ -254,22 +254,22 @@ bool get_metadata(struct track_info* track, int fd, const char* trackname,
break; break;
case AFMT_SID: case AFMT_SID:
if (!get_sid_metadata(fd, &(track->id3))) if (!get_sid_metadata(fd, id3))
{ {
return false; return false;
} }
break; break;
case AFMT_SPC: case AFMT_SPC:
if(!get_spc_metadata(fd, &(track->id3))) if(!get_spc_metadata(fd, id3))
{ {
DEBUGF("get_spc_metadata error\n"); DEBUGF("get_spc_metadata error\n");
} }
track->id3.filesize = filesize(fd); id3->filesize = filesize(fd);
track->id3.genre_string = id3_get_num_genre(36); id3->genre_string = id3_get_num_genre(36);
break; break;
case AFMT_ADX: case AFMT_ADX:
if (!get_adx_metadata(fd, &(track->id3))) if (!get_adx_metadata(fd, id3))
{ {
DEBUGF("get_adx_metadata error\n"); DEBUGF("get_adx_metadata error\n");
return false; return false;
@ -277,19 +277,19 @@ bool get_metadata(struct track_info* track, int fd, const char* trackname,
break; break;
case AFMT_NSF: case AFMT_NSF:
buf = (unsigned char *)track->id3.path; buf = (unsigned char *)id3->path;
if ((lseek(fd, 0, SEEK_SET) < 0) || ((read(fd, buf, 8)) < 8)) if ((lseek(fd, 0, SEEK_SET) < 0) || ((read(fd, buf, 8)) < 8))
{ {
DEBUGF("lseek or read failed\n"); DEBUGF("lseek or read failed\n");
return false; return false;
} }
track->id3.vbr = false; id3->vbr = false;
track->id3.filesize = filesize(fd); id3->filesize = filesize(fd);
if (memcmp(buf,"NESM",4) && memcmp(buf,"NSFE",4)) return false; if (memcmp(buf,"NESM",4) && memcmp(buf,"NSFE",4)) return false;
break; break;
case AFMT_AIFF: case AFMT_AIFF:
if (!get_aiff_metadata(fd, &(track->id3))) if (!get_aiff_metadata(fd, id3))
{ {
return false; return false;
} }
@ -310,13 +310,12 @@ bool get_metadata(struct track_info* track, int fd, const char* trackname,
#ifndef __PCTOOL__ #ifndef __PCTOOL__
if (cuesheet_is_enabled() && look_for_cuesheet_file(trackname, NULL)) if (cuesheet_is_enabled() && look_for_cuesheet_file(trackname, NULL))
{ {
track->id3.cuesheet_type = 1; id3->cuesheet_type = 1;
} }
#endif #endif
lseek(fd, 0, SEEK_SET); lseek(fd, 0, SEEK_SET);
strncpy(track->id3.path, trackname, sizeof(track->id3.path)); strncpy(id3->path, trackname, sizeof(id3->path));
track->taginfo_ready = true;
return true; return true;
} }

2
apps/metadata.h
View file

@ -23,7 +23,7 @@
#include "playback.h" #include "playback.h"
unsigned int probe_file_format(const char *filename); unsigned int probe_file_format(const char *filename);
bool get_metadata(struct track_info* track, int fd, const char* trackname, bool get_metadata(struct mp3entry* id3, int fd, const char* trackname,
bool v1first); bool v1first);
#endif #endif

6
apps/playback.c
View file

@ -2746,8 +2746,9 @@ static bool audio_load_track(int offset, bool start_play, bool rebuffer)
/* Get track metadata if we don't already have it. */ /* Get track metadata if we don't already have it. */
if (!tracks[track_widx].taginfo_ready) if (!tracks[track_widx].taginfo_ready)
{ {
if (get_metadata(&tracks[track_widx],current_fd,trackname,v1first)) if (get_metadata(&(tracks[track_widx].id3),current_fd,trackname,v1first))
{ {
tracks[track_widx].taginfo_ready = true;
if (start_play) if (start_play)
{ {
track_changed = true; track_changed = true;
@ -2887,10 +2888,11 @@ static bool audio_read_next_metadata(void)
if (fd < 0) if (fd < 0)
return false; return false;
status = get_metadata(&tracks[next_idx],fd,trackname,v1first); status = get_metadata(&(tracks[next_idx].id3),fd,trackname,v1first);
/* Preload the glyphs in the tags */ /* Preload the glyphs in the tags */
if (status) if (status)
{ {
tracks[next_idx].taginfo_ready = true;
if (tracks[next_idx].id3.title) if (tracks[next_idx].id3.title)
lcd_getstringsize(tracks[next_idx].id3.title, NULL, NULL); lcd_getstringsize(tracks[next_idx].id3.title, NULL, NULL);
if (tracks[next_idx].id3.artist) if (tracks[next_idx].id3.artist)

2
apps/plugin.h
View file

@ -620,7 +620,7 @@ struct plugin_api {
int (*codec_load_file)(const char* codec, struct codec_api *api); int (*codec_load_file)(const char* codec, struct codec_api *api);
const char *(*get_codec_filename)(int cod_spec); const char *(*get_codec_filename)(int cod_spec);
bool (*get_metadata)(struct track_info* track, int fd, const char* trackname, bool (*get_metadata)(struct mp3entry* id3, int fd, const char* trackname,
bool v1first); bool v1first);
#endif #endif
void (*led)(bool on); void (*led)(bool on);

2
apps/plugins/test_codec.c
View file

@ -536,7 +536,7 @@ static enum plugin_status test_track(char* filename)
/* Clear the id3 struct */ /* Clear the id3 struct */
rb->memset(&track.id3, 0, sizeof(struct mp3entry)); rb->memset(&track.id3, 0, sizeof(struct mp3entry));
if (!rb->get_metadata(&track, fd, filename, if (!rb->get_metadata(&(track.id3), fd, filename,
rb->global_settings->id3_v1_first)) rb->global_settings->id3_v1_first))
{ {
log_text("Cannot read metadata",true); log_text("Cannot read metadata",true);

2
apps/tagcache.c
View file

@ -1660,7 +1660,7 @@ static void add_tagcache(char *path)
memset(&track, 0, sizeof(struct track_info)); memset(&track, 0, sizeof(struct track_info));
memset(&entry, 0, sizeof(struct temp_file_entry)); memset(&entry, 0, sizeof(struct temp_file_entry));
memset(&tracknumfix, 0, sizeof(tracknumfix)); memset(&tracknumfix, 0, sizeof(tracknumfix));
ret = get_metadata(&track, fd, path, false); ret = get_metadata(&(track.id3), fd, path, false);
close(fd); close(fd);
if (!ret) if (!ret)