aboutsummaryrefslogtreecommitdiffstats
path: root/src/decoder/oggvorbis_plugin.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-11-11 15:55:34 +0100
committerMax Kellermann <max@duempel.org>2008-11-11 15:55:34 +0100
commit114b3c1e78433ff3760a28641d6da3925ef8d3ce (patch)
treef92bc79eda01492741cf37a824d922c10758c1a2 /src/decoder/oggvorbis_plugin.c
parent54ad08ab378f9e988cc8289c0923e50047805b1f (diff)
downloadmpd-114b3c1e78433ff3760a28641d6da3925ef8d3ce.tar.gz
mpd-114b3c1e78433ff3760a28641d6da3925ef8d3ce.tar.xz
mpd-114b3c1e78433ff3760a28641d6da3925ef8d3ce.zip
replay_gain: no CamelCase
Renamed functions and variables.
Diffstat (limited to 'src/decoder/oggvorbis_plugin.c')
-rw-r--r--src/decoder/oggvorbis_plugin.c22
1 files changed, 12 insertions, 10 deletions
diff --git a/src/decoder/oggvorbis_plugin.c b/src/decoder/oggvorbis_plugin.c
index cc6f8f119..d73a5f7f5 100644
--- a/src/decoder/oggvorbis_plugin.c
+++ b/src/decoder/oggvorbis_plugin.c
@@ -93,31 +93,33 @@ static const char *ogg_parseComment(const char *comment, const char *needle)
return NULL;
}
-static void ogg_getReplayGainInfo(char **comments, ReplayGainInfo ** infoPtr)
+static void
+ogg_getReplayGainInfo(char **comments,
+ struct replay_gain_info **infoPtr)
{
const char *temp;
bool found = false;
if (*infoPtr)
- freeReplayGainInfo(*infoPtr);
- *infoPtr = newReplayGainInfo();
+ replay_gain_info_free(*infoPtr);
+ *infoPtr = replay_gain_info_new();
while (*comments) {
if ((temp =
ogg_parseComment(*comments, "replaygain_track_gain"))) {
- (*infoPtr)->trackGain = atof(temp);
+ (*infoPtr)->track_gain = atof(temp);
found = true;
} else if ((temp = ogg_parseComment(*comments,
"replaygain_album_gain"))) {
- (*infoPtr)->albumGain = atof(temp);
+ (*infoPtr)->album_gain = atof(temp);
found = true;
} else if ((temp = ogg_parseComment(*comments,
"replaygain_track_peak"))) {
- (*infoPtr)->trackPeak = atof(temp);
+ (*infoPtr)->track_peak = atof(temp);
found = true;
} else if ((temp = ogg_parseComment(*comments,
"replaygain_album_peak"))) {
- (*infoPtr)->albumPeak = atof(temp);
+ (*infoPtr)->album_peak = atof(temp);
found = true;
}
@@ -125,7 +127,7 @@ static void ogg_getReplayGainInfo(char **comments, ReplayGainInfo ** infoPtr)
}
if (!found) {
- freeReplayGainInfo(*infoPtr);
+ replay_gain_info_free(*infoPtr);
*infoPtr = NULL;
}
}
@@ -209,7 +211,7 @@ oggvorbis_decode(struct decoder *decoder, struct input_stream *inStream)
int chunkpos = 0;
long bitRate = 0;
long test;
- ReplayGainInfo *replayGainInfo = NULL;
+ struct replay_gain_info *replayGainInfo = NULL;
char **comments;
const char *errorStr;
bool initialized = false;
@@ -324,7 +326,7 @@ oggvorbis_decode(struct decoder *decoder, struct input_stream *inStream)
}
if (replayGainInfo)
- freeReplayGainInfo(replayGainInfo);
+ replay_gain_info_free(replayGainInfo);
ov_clear(&vf);
return true;