diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/codecs/mpa.c | 3 | ||||
| -rw-r--r-- | apps/metadata.c | 38 | ||||
| -rw-r--r-- | apps/screens.c | 8 |
3 files changed, 13 insertions, 36 deletions
diff --git a/apps/codecs/mpa.c b/apps/codecs/mpa.c index 2dcc719..fb47822 100644 --- a/apps/codecs/mpa.c +++ b/apps/codecs/mpa.c @@ -118,6 +118,7 @@ enum codec_status codec_start(struct codec_api* api) frequency_divider = 441; ci->configure(DSP_SET_FREQUENCY, (int *)ci->id3->frequency); + codec_set_replaygain(ci->id3); ci->request_buffer(&size, ci->id3->first_frame_offset); ci->advance_buffer(size); @@ -144,7 +145,7 @@ enum codec_status codec_start(struct codec_api* api) samplecount = ci->id3->length * frequency_divider / 10; samplesdone = ci->id3->elapsed * frequency_divider / 10; } - + /* This is the decoding loop. */ while (1) { ci->yield(); diff --git a/apps/metadata.c b/apps/metadata.c index 409bdf8..bbbfe07 100644 --- a/apps/metadata.c +++ b/apps/metadata.c @@ -528,7 +528,7 @@ static bool get_apetag_info (struct mp3entry *entry, int fd) if (rem_space > 1 && get_apetag_item (&temp_apetag, "replaygain_track_gain", temp_buffer, rem_space)) { - entry->track_gain = get_replaygain (entry->track_gain_str = temp_buffer); + entry->track_gain = get_replaygain (entry->track_gain_string = temp_buffer); str_space = strlen (temp_buffer) + 1; temp_buffer += str_space; rem_space -= str_space; @@ -536,7 +536,7 @@ static bool get_apetag_info (struct mp3entry *entry, int fd) if (rem_space > 1 && get_apetag_item (&temp_apetag, "replaygain_album_gain", temp_buffer, rem_space)) { - entry->album_gain = get_replaygain (entry->album_gain_str = temp_buffer); + entry->album_gain = get_replaygain (entry->album_gain_string = temp_buffer); str_space = strlen (temp_buffer) + 1; temp_buffer += str_space; rem_space -= str_space; @@ -910,37 +910,13 @@ static bool get_vorbis_comments (struct mp3entry *entry, int fd) } else if (strncasecmp(temp, "TRACKNUMBER=", 12) == 0) { name_length = 11; p = &(entry->track_string); - } else if ((strncasecmp(temp, "RG_RADIO=", 9) == 0) - && !entry->track_gain) { - entry->track_gain = get_replaygain(&temp[9]); - name_length = 8; - p = &(entry->track_gain_str); - } else if (strncasecmp(temp, "REPLAYGAIN_TRACK_GAIN=", 22) == 0) { - entry->track_gain = get_replaygain(&temp[22]); - name_length = 21; - p = &(entry->track_gain_str); - } else if ((strncasecmp(temp, "RG_AUDIOPHILE=", 14) == 0) - && !entry->album_gain) { - entry->album_gain = get_replaygain(&temp[14]); - name_length = 13; - p = &(entry->album_gain_str); - } else if (strncasecmp(temp, "REPLAYGAIN_ALBUM_GAIN=", 22) == 0) { - entry->album_gain = get_replaygain(&temp[22]); - name_length = 21; - p = &(entry->album_gain_str); - } else if ((strncasecmp(temp, "RG_PEAK=", 8) == 0) - && !entry->track_peak) { - entry->track_peak = get_replaypeak(&temp[8]); - p = NULL; - } else if (strncasecmp(temp, "REPLAYGAIN_TRACK_PEAK=", 22) == 0) { - entry->track_peak = get_replaypeak(&temp[22]); - p = NULL; - } else if (strncasecmp(temp, "REPLAYGAIN_ALBUM_PEAK=", 22) == 0) { - entry->album_peak = get_replaypeak(&temp[22]); - p = NULL; } else { + int value_length = parse_replaygain(temp, NULL, entry, buffer, + buffer_remaining); + buffer_remaining -= value_length; + buffer += value_length; p = NULL; - } + } if (p) { comment_length -= (name_length + 1); diff --git a/apps/screens.c b/apps/screens.c index 86d11a7..2c7d5fe 100644 --- a/apps/screens.c +++ b/apps/screens.c @@ -1388,15 +1388,15 @@ bool browse_id3(void) #if CONFIG_HWCODEC == MASNONE case 11: lcd_puts(0, 0, str(LANG_ID3_TRACK_GAIN)); - lcd_puts(0, 1, id3->track_gain_str - ? id3->track_gain_str + lcd_puts(0, 1, id3->track_gain_string + ? id3->track_gain_string : (char*) str(LANG_ID3_NO_GAIN)); break; case 12: lcd_puts(0, 0, str(LANG_ID3_ALBUM_GAIN)); - lcd_puts(0, 1, id3->album_gain_str - ? id3->album_gain_str + lcd_puts(0, 1, id3->album_gain_string + ? id3->album_gain_string : (char*) str(LANG_ID3_NO_GAIN)); break; #endif |