aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-09-24 20:10:59 +0200
committerMax Kellermann <max@duempel.org>2014-09-24 21:50:34 +0200
commit05dd9acba8c7534c8e8f01bf15342ab7493d28fc (patch)
treeeab583c0b671e0d405dc41cbccfdebc740cf3819
parent92704857231423f662152495d5521301195dfd17 (diff)
downloadmpd-05dd9acba8c7534c8e8f01bf15342ab7493d28fc.tar.gz
mpd-05dd9acba8c7534c8e8f01bf15342ab7493d28fc.tar.xz
mpd-05dd9acba8c7534c8e8f01bf15342ab7493d28fc.zip
tag/ApeReplayGain, decoder/mad: move duplicate code to tag/ReplayGain.cxx
-rw-r--r--Makefile.am1
-rw-r--r--src/decoder/plugins/MadDecoderPlugin.cxx14
-rw-r--r--src/tag/ApeReplayGain.cxx17
-rw-r--r--src/tag/ReplayGain.cxx48
-rw-r--r--src/tag/ReplayGain.hxx30
5 files changed, 83 insertions, 27 deletions
diff --git a/Makefile.am b/Makefile.am
index d7ea9291a..080bf309a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -766,6 +766,7 @@ libtag_a_SOURCES =\
src/tag/TagPool.cxx src/tag/TagPool.hxx \
src/tag/TagTable.cxx src/tag/TagTable.hxx \
src/tag/Set.cxx src/tag/Set.hxx \
+ src/tag/ReplayGain.cxx src/tag/ReplayGain.hxx \
src/tag/ApeLoader.cxx src/tag/ApeLoader.hxx \
src/tag/ApeReplayGain.cxx src/tag/ApeReplayGain.hxx \
src/tag/ApeTag.cxx src/tag/ApeTag.hxx
diff --git a/src/decoder/plugins/MadDecoderPlugin.cxx b/src/decoder/plugins/MadDecoderPlugin.cxx
index 8c9707b89..3cbc448f7 100644
--- a/src/decoder/plugins/MadDecoderPlugin.cxx
+++ b/src/decoder/plugins/MadDecoderPlugin.cxx
@@ -25,6 +25,7 @@
#include "tag/TagId3.hxx"
#include "tag/TagRva2.hxx"
#include "tag/TagHandler.hxx"
+#include "tag/ReplayGain.hxx"
#include "CheckAudioFormat.hxx"
#include "util/StringUtil.hxx"
#include "util/ASCII.hxx"
@@ -270,19 +271,8 @@ parse_id3_replay_gain_info(ReplayGainInfo &rgi,
id3_ucs4_latin1duplicate(id3_field_getstring
(&frame->fields[2]));
- if (StringEqualsCaseASCII(key, "replaygain_track_gain")) {
- rgi.tuples[REPLAY_GAIN_TRACK].gain = atof(value);
+ if (ParseReplayGainTag(rgi, key, value))
found = true;
- } else if (StringEqualsCaseASCII(key, "replaygain_album_gain")) {
- rgi.tuples[REPLAY_GAIN_ALBUM].gain = atof(value);
- found = true;
- } else if (StringEqualsCaseASCII(key, "replaygain_track_peak")) {
- rgi.tuples[REPLAY_GAIN_TRACK].peak = atof(value);
- found = true;
- } else if (StringEqualsCaseASCII(key, "replaygain_album_peak")) {
- rgi.tuples[REPLAY_GAIN_ALBUM].peak = atof(value);
- found = true;
- }
free(key);
free(value);
diff --git a/src/tag/ApeReplayGain.cxx b/src/tag/ApeReplayGain.cxx
index 6afb3e96e..345f45710 100644
--- a/src/tag/ApeReplayGain.cxx
+++ b/src/tag/ApeReplayGain.cxx
@@ -20,7 +20,7 @@
#include "config.h"
#include "ApeReplayGain.hxx"
#include "ApeLoader.hxx"
-#include "ReplayGainInfo.hxx"
+#include "ReplayGain.hxx"
#include "util/ASCII.hxx"
#include "fs/Path.hxx"
@@ -43,20 +43,7 @@ replay_gain_ape_callback(unsigned long flags, const char *key,
memcpy(value, _value, value_length);
value[value_length] = 0;
- if (StringEqualsCaseASCII(key, "replaygain_track_gain")) {
- info.tuples[REPLAY_GAIN_TRACK].gain = atof(value);
- return true;
- } else if (StringEqualsCaseASCII(key, "replaygain_album_gain")) {
- info.tuples[REPLAY_GAIN_ALBUM].gain = atof(value);
- return true;
- } else if (StringEqualsCaseASCII(key, "replaygain_track_peak")) {
- info.tuples[REPLAY_GAIN_TRACK].peak = atof(value);
- return true;
- } else if (StringEqualsCaseASCII(key, "replaygain_album_peak")) {
- info.tuples[REPLAY_GAIN_ALBUM].peak = atof(value);
- return true;
- } else
- return false;
+ return ParseReplayGainTag(info, key, value);
}
bool
diff --git a/src/tag/ReplayGain.cxx b/src/tag/ReplayGain.cxx
new file mode 100644
index 000000000..f2f52e59c
--- /dev/null
+++ b/src/tag/ReplayGain.cxx
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2003-2014 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 "ReplayGain.hxx"
+#include "ReplayGainInfo.hxx"
+#include "util/ASCII.hxx"
+
+#include <assert.h>
+#include <stdlib.h>
+
+bool
+ParseReplayGainTag(ReplayGainInfo &info, const char *name, const char *value)
+{
+ assert(name != nullptr);
+ assert(value != nullptr);
+
+ if (StringEqualsCaseASCII(name, "replaygain_track_gain")) {
+ info.tuples[REPLAY_GAIN_TRACK].gain = atof(value);
+ return true;
+ } else if (StringEqualsCaseASCII(name, "replaygain_album_gain")) {
+ info.tuples[REPLAY_GAIN_ALBUM].gain = atof(value);
+ return true;
+ } else if (StringEqualsCaseASCII(name, "replaygain_track_peak")) {
+ info.tuples[REPLAY_GAIN_TRACK].peak = atof(value);
+ return true;
+ } else if (StringEqualsCaseASCII(name, "replaygain_album_peak")) {
+ info.tuples[REPLAY_GAIN_ALBUM].peak = atof(value);
+ return true;
+ } else
+ return false;
+}
diff --git a/src/tag/ReplayGain.hxx b/src/tag/ReplayGain.hxx
new file mode 100644
index 000000000..2e6cf799e
--- /dev/null
+++ b/src/tag/ReplayGain.hxx
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2003-2014 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_TAG_REPLAY_GAIN_HXX
+#define MPD_TAG_REPLAY_GAIN_HXX
+
+#include "check.h"
+
+struct ReplayGainInfo;
+
+bool
+ParseReplayGainTag(ReplayGainInfo &info, const char *name, const char *value);
+
+#endif