oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Cleanup id3 ReplayGain parsing code.

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@4280 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
J. Alexander Treuman
2006-06-21 16:38:18 +00:00
parent fd6696e46a
commit e2a14f5b9e
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/inputPlugins/mp3_plugin.c
View File

@@ -209,15 +209,15 @@ int fillMp3InputBuffer(mp3DecodeData * data) {
} }
#ifdef HAVE_ID3TAG #ifdef HAVE_ID3TAG
void mp3_getReplayGainInfo(struct id3_tag * tag, ReplayGainInfo ** infoPtr) { static ReplayGainInfo * parseId3ReplayGainInfo(struct id3_tag * tag) {
int i; int i;
char * key; char * key;
char * value; char * value;
struct id3_frame * frame; struct id3_frame * frame;
int found = 0; int found = 0;
ReplayGainInfo * replayGainInfo;
if(*infoPtr) freeReplayGainInfo(*infoPtr); replayGainInfo = newReplayGainInfo();
*infoPtr = newReplayGainInfo();
for(i=0;(frame = id3_tag_findframe(tag, "TXXX", i));i++) { for(i=0;(frame = id3_tag_findframe(tag, "TXXX", i));i++) {
if(frame->nfields < 3) continue; if(frame->nfields < 3) continue;
@@ -226,31 +226,29 @@ void mp3_getReplayGainInfo(struct id3_tag * tag, ReplayGainInfo ** infoPtr) {
value = (char *) id3_ucs4_latin1duplicate(id3_field_getstring(&frame->fields[2])); value = (char *) id3_ucs4_latin1duplicate(id3_field_getstring(&frame->fields[2]));
if(strcmp(key, "replaygain_track_gain") == 0) { if(strcmp(key, "replaygain_track_gain") == 0) {
(*infoPtr)->trackGain = atof(value); replayGainInfo->trackGain = atof(value);
found = 1; found = 1;
} }
else if(strcmp(key, "replaygain_album_gain") == 0) { else if(strcmp(key, "replaygain_album_gain") == 0) {
(*infoPtr)->albumGain = atof(value); replayGainInfo->albumGain = atof(value);
found = 1; found = 1;
} }
else if(strcmp(key, "replaygain_track_peak") == 0) { else if(strcmp(key, "replaygain_track_peak") == 0) {
(*infoPtr)->trackPeak = atof(value); replayGainInfo->trackPeak = atof(value);
found = 1; found = 1;
} }
else if(strcmp(key, "replaygain_album_peak") == 0) { else if(strcmp(key, "replaygain_album_peak") == 0) {
(*infoPtr)->albumPeak = atof(value); replayGainInfo->albumPeak = atof(value);
found = 1; found = 1;
} }
free(key); free(key);
free(value); free(value);
} }
if(!found) { if(found) return replayGainInfo;
freeReplayGainInfo(*infoPtr); freeReplayGainInfo(replayGainInfo);
*infoPtr = NULL; return NULL;
}
} }
#endif #endif
@@ -261,6 +259,7 @@ static void mp3_parseId3Tag(mp3DecodeData * data, signed long tagsize, MpdTag **
id3_byte_t const *id3_data; id3_byte_t const *id3_data;
id3_byte_t * allocated = NULL; id3_byte_t * allocated = NULL;
MpdTag * tmpMpdTag; MpdTag * tmpMpdTag;
ReplayGainInfo * tmpReplayGainInfo;
count = data->stream.bufend - data->stream.this_frame; count = data->stream.bufend - data->stream.this_frame;
@@ -307,7 +306,14 @@ static void mp3_parseId3Tag(mp3DecodeData * data, signed long tagsize, MpdTag **
} }
} }
if(replayGainInfo) mp3_getReplayGainInfo(id3Tag, replayGainInfo); if(replayGainInfo) {
tmpReplayGainInfo = parseId3ReplayGainInfo(id3Tag);
if(tmpReplayGainInfo) {
if(*replayGainInfo) freeReplayGainInfo(*replayGainInfo);
*replayGainInfo = tmpReplayGainInfo;
}
}
id3_tag_delete(id3Tag); id3_tag_delete(id3Tag);
fail: fail:
if(allocated) free(allocated); if(allocated) free(allocated);