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

wavpack: added wavpack_tag_float()

Browse Source 
The function simplifies wavpack_replaygain(), because it already
contains the float parser, and it works with a fixed buffer instead of
doing expensive heap allocations.
This commit is contained in:
Max Kellermann
2008-11-11 16:21:09 +01:00
parent c883d761ab
commit 5e686add91
1 changed files with 24 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/decoder/wavpack_plugin.c
View File

@@ -213,20 +213,22 @@ wavpack_decode(struct decoder * decoder, WavpackContext *wpc, bool canseek,
} while (samplesgot == samplesreq); } while (samplesgot == samplesreq);
} }
static char * /**
wavpack_tag(WavpackContext *wpc, const char *key) * Locate and parse a floating point tag. Returns true if it was
* found.
*/
static bool
wavpack_tag_float(WavpackContext *wpc, const char *key, float *value_r)
{ {
char *value = NULL; char buffer[64];
int size; int ret;
size = WavpackGetTagItem(wpc, key, NULL, 0); ret = WavpackGetTagItem(wpc, key, buffer, sizeof(buffer));
if (size > 0) { if (ret <= 0)
size++; return false;
value = g_malloc(size);
WavpackGetTagItem(wpc, key, value, size);
}
return value; *value_r = atof(buffer);
return true;
} }
static struct replay_gain_info * static struct replay_gain_info *
@@ -234,38 +236,20 @@ wavpack_replaygain(WavpackContext *wpc)
{ {
struct replay_gain_info *replay_gain_info; struct replay_gain_info *replay_gain_info;
bool found = false; bool found = false;
char *value;
replay_gain_info = replay_gain_info_new(); replay_gain_info = replay_gain_info_new();
value = wavpack_tag(wpc, "replaygain_track_gain"); found = wavpack_tag_float(wpc, "replaygain_track_gain",
if (value) { &replay_gain_info->track_gain)
replay_gain_info->track_gain = atof(value); ||
free(value); wavpack_tag_float(wpc, "replaygain_track_peak",
found = true; &replay_gain_info->track_peak)
} ||
wavpack_tag_float(wpc, "replaygain_album_gain",
value = wavpack_tag(wpc, "replaygain_album_gain"); &replay_gain_info->album_gain)
if (value) { ||
replay_gain_info->album_gain = atof(value); wavpack_tag_float(wpc, "replaygain_album_peak",
free(value); &replay_gain_info->album_peak);
found = true;
}
value = wavpack_tag(wpc, "replaygain_track_peak");
if (value) {
replay_gain_info->track_peak = atof(value);
free(value);
found = true;
}
value = wavpack_tag(wpc, "replaygain_album_peak");
if (value) {
replay_gain_info->album_peak = atof(value);
free(value);
found = true;
}
if (found) { if (found) {
return replay_gain_info; return replay_gain_info;