1
0
Fork 0
forked from len0rd/rockbox

Remove some debug code. Remove some unnecessary checks.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14454 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Magnus Holmgren 2007-08-25 10:56:22 +00:00
parent 4e68732769
commit cdfb22f9df
2 changed files with 8 additions and 22 deletions

View file

@ -467,11 +467,9 @@ static int parserva2( struct mp3entry* entry, char* tag, int bufferpos )
gain = 0; gain = 0;
} }
if (gain) {
value_len = parse_replaygain_int(album, gain, peak * 2, entry, value_len = parse_replaygain_int(album, gain, peak * 2, entry,
tag, sizeof(entry->id3v2buf) - (tag - entry->id3v2buf)); tag, sizeof(entry->id3v2buf) - (tag - entry->id3v2buf));
} }
}
return tag - entry->id3v2buf + value_len; return tag - entry->id3v2buf + value_len;
} }

View file

@ -429,34 +429,22 @@ long parse_replaygain_int(bool album, long gain, long peak,
gain = convert_gain(gain * FP_ONE / 512); gain = convert_gain(gain * FP_ONE / 512);
} }
DEBUGF(" Album: %d\n", album);
DEBUGF(" Gain: %ld.%06ld\n", gain >> 24,
(long) (((long long) (abs(gain) & 0x00ffffff) * 1000000) / 0x01000000));
DEBUGF(" Peak: %ld.%06ld\n", peak >> 24,
(long) (((long long) (abs(peak) & 0x00ffffff) * 1000000) / 0x01000000));
if (album) if (album)
{
if (!entry->album_gain)
{ {
entry->album_gain = gain; entry->album_gain = gain;
entry->album_gain_string = buffer; entry->album_gain_string = buffer;
}
if (!entry->album_peak) if (peak)
{ {
entry->album_peak = peak; entry->album_peak = peak;
} }
} }
else else
{
if (!entry->track_gain)
{ {
entry->track_gain = gain; entry->track_gain = gain;
entry->track_gain_string = buffer; entry->track_gain_string = buffer;
}
if (!entry->track_peak) if (peak)
{ {
entry->track_peak = peak; entry->track_peak = peak;
} }