aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2010-11-18 22:25:11 +0100
committerMax Kellermann <max@duempel.org>2010-11-18 22:26:06 +0100
commitf6bbe1332f63560bd212a068e8fc9faf16455dc7 (patch)
treec0b6d42e2e4829a5bc5a9913bf00f5045cba4566
parent11613347bedef464029c167116d226ec3fddfdcd (diff)
downloadmpd-f6bbe1332f63560bd212a068e8fc9faf16455dc7.tar.gz
mpd-f6bbe1332f63560bd212a068e8fc9faf16455dc7.tar.xz
mpd-f6bbe1332f63560bd212a068e8fc9faf16455dc7.zip
replay_gain_ape: parse replay gain from APE tags
Based on the APE reader.
Diffstat (limited to '')
-rw-r--r--Makefile.am2
-rw-r--r--NEWS1
-rw-r--r--src/replay_gain_ape.c78
-rw-r--r--src/replay_gain_ape.h32
4 files changed, 113 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 6160ac79c..0966a2a66 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -187,6 +187,7 @@ mpd_headers = \
src/refcount.h \
src/replay_gain_config.h \
src/replay_gain_info.h \
+ src/replay_gain_ape.h \
src/sig_handlers.h \
src/song.h \
src/song_print.h \
@@ -414,6 +415,7 @@ TAG_LIBS = \
TAG_SRC = \
src/ape.c \
+ src/replay_gain_ape.c \
src/tag_ape.c
if HAVE_ID3TAG
diff --git a/NEWS b/NEWS
index 6e85e5283..998a44ab3 100644
--- a/NEWS
+++ b/NEWS
@@ -88,6 +88,7 @@ ver 0.16 (20??/??/??)
- fall back to track gain if album gain is unavailable
- optionally use hardware mixer to apply replay gain
- added mode "auto"
+ - parse replay gain from APE tags
* log unused/unknown block parameters
* removed the deprecated "error_file" option
* save state when stopped
diff --git a/src/replay_gain_ape.c b/src/replay_gain_ape.c
new file mode 100644
index 000000000..9ae47468f
--- /dev/null
+++ b/src/replay_gain_ape.c
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+#include "replay_gain_ape.h"
+#include "replay_gain_info.h"
+#include "ape.h"
+
+#include <glib.h>
+
+#include <string.h>
+#include <stdlib.h>
+
+struct rg_ape_ctx {
+ struct replay_gain_info *info;
+ bool found;
+};
+
+static bool
+replay_gain_ape_callback(unsigned long flags, const char *key,
+ const char *_value, size_t value_length, void *_ctx)
+{
+ struct rg_ape_ctx *ctx = _ctx;
+
+ /* we only care about utf-8 text tags */
+ if ((flags & (0x3 << 1)) != 0)
+ return true;
+
+ char value[16];
+ if (value_length >= sizeof(value))
+ return true;
+ memcpy(value, _value, value_length);
+ value[value_length] = 0;
+
+ if (g_ascii_strcasecmp(key, "replaygain_track_gain") == 0) {
+ ctx->info->tuples[REPLAY_GAIN_TRACK].gain = atof(value);
+ ctx->found = true;
+ } else if (g_ascii_strcasecmp(key, "replaygain_album_gain") == 0) {
+ ctx->info->tuples[REPLAY_GAIN_ALBUM].gain = atof(value);
+ ctx->found = true;
+ } else if (g_ascii_strcasecmp(key, "replaygain_track_peak") == 0) {
+ ctx->info->tuples[REPLAY_GAIN_TRACK].peak = atof(value);
+ ctx->found = true;
+ } else if (g_ascii_strcasecmp(key, "replaygain_album_peak") == 0) {
+ ctx->info->tuples[REPLAY_GAIN_ALBUM].peak = atof(value);
+ ctx->found = true;
+ }
+
+ return true;
+}
+
+bool
+replay_gain_ape_read(const char *path_fs, struct replay_gain_info *info)
+{
+ struct rg_ape_ctx ctx = {
+ .info = info,
+ .found = false,
+ };
+
+ return tag_ape_scan(path_fs, replay_gain_ape_callback, &ctx) &&
+ ctx.found;
+}
diff --git a/src/replay_gain_ape.h b/src/replay_gain_ape.h
new file mode 100644
index 000000000..8525ac85e
--- /dev/null
+++ b/src/replay_gain_ape.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_REPLAY_GAIN_APE_H
+#define MPD_REPLAY_GAIN_APE_H
+
+#include "check.h"
+
+#include <stdbool.h>
+
+struct replay_gain_info;
+
+bool
+replay_gain_ape_read(const char *path_fs, struct replay_gain_info *info);
+
+#endif