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

decoder/mad: move code to tag/MixRamp.cxx

Browse Source
This commit is contained in:
Max Kellermann 2014-09-24 20:31:54 +02:00
parent d82547acd3
commit 6c48aa5fae
4 changed files with 96 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -768,6 +768,7 @@ libtag_a_SOURCES =\
src/tag/Set.cxx src/tag/Set.hxx \
src/tag/VorbisComment.cxx src/tag/VorbisComment.hxx \
src/tag/ReplayGain.cxx src/tag/ReplayGain.hxx \
src/tag/MixRamp.cxx src/tag/MixRamp.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

7
src/decoder/plugins/MadDecoderPlugin.cxx
View File

@ -26,6 +26,7 @@
#include "tag/TagRva2.hxx"
#include "tag/TagHandler.hxx"
#include "tag/ReplayGain.hxx"
#include "tag/MixRamp.hxx"
#include "CheckAudioFormat.hxx"
#include "util/StringUtil.hxx"
#include "util/ASCII.hxx"
@ -303,11 +304,7 @@ parse_id3_mixramp(struct id3_tag *tag)
id3_ucs4_latin1duplicate(id3_field_getstring
(&frame->fields[2]));
if (StringEqualsCaseASCII(key, "mixramp_start")) {
result.SetStart(value);
} else if (StringEqualsCaseASCII(key, "mixramp_end")) {
result.SetEnd(value);
}
ParseMixRampTag(result, key, value);
free(key);
free(value);

63
src/tag/MixRamp.cxx Normal file
View File

@ -0,0 +1,63 @@
/*
* 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 "MixRamp.hxx"
#include "MixRampInfo.hxx"
#include "util/ASCII.hxx"
#include <assert.h>
template<typename T>
static bool
ParseMixRampTagTemplate(MixRampInfo &info, const T t)
{
const char *value;
if ((value = t["mixramp_start"]) != nullptr) {
info.SetStart(value);
return true;
} else if ((value = t["mixramp_end"]) != nullptr) {
info.SetEnd(value);
return true;
} else
return false;
}
bool
ParseMixRampTag(MixRampInfo &info, const char *name, const char *value)
{
assert(name != nullptr);
assert(value != nullptr);
struct NameValue {
const char *name;
const char *value;
gcc_pure
const char *operator[](const char *n) const {
return StringEqualsCaseASCII(name, n)
? value
: nullptr;
}
};
return ParseMixRampTagTemplate(info, NameValue{name, value});
}

30
src/tag/MixRamp.hxx Normal file
View File

@ -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_MIXRAMP_HXX
#define MPD_TAG_MIXRAMP_HXX
#include "check.h"
class MixRampInfo;
bool
ParseMixRampTag(MixRampInfo &info, const char *name, const char *value);
#endif