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

Tag: compile-time initialisation of ignore_tag_items

Browse Source 
Move to TagSettings.c and use C99 initializers.
This commit is contained in:
Max Kellermann 2013-09-05 18:34:12 +02:00
parent fcccedc588
commit 5d5f21bfc5
10 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -426,7 +426,7 @@ libtag_a_SOURCES =\
src/tag/Tag.cxx src/tag/Tag.hxx \
src/tag/TagItem.hxx \
src/tag/TagHandler.cxx src/tag/TagHandler.hxx \
src/tag/TagInternal.hxx \
src/tag/TagSettings.c src/tag/TagSettings.h \
src/tag/TagConfig.cxx src/tag/TagConfig.hxx \
src/tag/TagNames.c \
src/tag/TagString.cxx src/tag/TagString.hxx \

2
src/DatabaseSave.cxx
View File

@ -26,7 +26,7 @@
#include "Song.hxx"
#include "TextFile.hxx"
#include "tag/Tag.hxx"
#include "tag/TagInternal.hxx"
#include "tag/TagSettings.h"
#include "fs/Path.hxx"
#include "util/Error.hxx"

2
src/Main.cxx
View File

@ -38,7 +38,6 @@
#include "Partition.hxx"
#include "Volume.hxx"
#include "OutputAll.hxx"
#include "tag/Tag.hxx"
#include "tag/TagConfig.hxx"
#include "replay_gain_config.h"
#include "Idle.hxx"
@ -376,7 +375,6 @@ int mpd_main(int argc, char *argv[])
}
stats_global_init();
tag_lib_init();
TagLoadConfig();
if (!log_init(options.verbose, options.log_stderr, error)) {

2
src/TagPrint.cxx
View File

@ -20,7 +20,7 @@
#include "config.h"
#include "TagPrint.hxx"
#include "tag/Tag.hxx"
#include "tag/TagInternal.hxx"
#include "tag/TagSettings.h"
#include "Song.hxx"
#include "Client.hxx"

10
src/tag/Tag.cxx
View File

@ -19,9 +19,9 @@
#include "config.h"
#include "Tag.hxx"
#include "TagInternal.hxx"
#include "TagPool.hxx"
#include "TagString.hxx"
#include "TagSettings.h"
#include <glib.h>
#include <assert.h>
@ -40,8 +40,6 @@ static struct {
TagItem *items[BULK_MAX];
} bulk;
bool ignore_tag_items[TAG_NUM_OF_ITEM_TYPES];
enum tag_type
tag_name_parse(const char *name)
{
@ -78,12 +76,6 @@ items_size(const Tag &tag)
return tag.num_items * sizeof(TagItem *);
}
void tag_lib_init(void)
{
/* ignore comments by default */
ignore_tag_items[TAG_COMMENT] = true;
}
void
Tag::Clear()
{

6
src/tag/Tag.hxx
View File

@ -186,10 +186,4 @@ tag_name_parse(const char *name);
enum tag_type
tag_name_parse_i(const char *name);
/**
* Initializes the tag library.
*/
void
tag_lib_init();
#endif

2
src/tag/TagConfig.cxx
View File

@ -19,7 +19,7 @@
#include "config.h"
#include "TagConfig.hxx"
#include "TagInternal.hxx"
#include "TagSettings.h"
#include "Tag.hxx"
#include "ConfigGlobal.hxx"
#include "ConfigOption.hxx"

25
src/tag/TagSettings.c Normal file
View File

@ -0,0 +1,25 @@
/*
* Copyright (C) 2003-2013 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 "TagSettings.h"
bool ignore_tag_items[TAG_NUM_OF_ITEM_TYPES] = {
/* ignore comments by default */
[TAG_COMMENT] = true,
};

6
src/tag/TagInternal.hxx → src/tag/TagSettings.h
View File

@ -17,11 +17,13 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef MPD_TAG_INTERNAL_HXX
#define MPD_TAG_INTERNAL_HXX
#ifndef MPD_TAG_SETTINGS_H
#define MPD_TAG_SETTINGS_H
#include "TagType.h"
#include <stdbool.h>
extern bool ignore_tag_items[TAG_NUM_OF_ITEM_TYPES];
#endif

2
test/DumpDatabase.cxx
View File

@ -26,7 +26,6 @@
#include "PlaylistVector.hxx"
#include "ConfigGlobal.hxx"
#include "ConfigData.hxx"
#include "tag/Tag.hxx"
#include "tag/TagConfig.hxx"
#include "fs/Path.hxx"
#include "util/Error.hxx"
@ -105,7 +104,6 @@ main(int argc, char **argv)
return EXIT_FAILURE;
}
tag_lib_init();
TagLoadConfig();
/* do it */