Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
681d6bbd
Commit
681d6bbd
authored
Sep 04, 2013
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
TagTable: un-inline the two functions
Reduce header dependencies.
parent
867b82b6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
65 additions
and
25 deletions
+65
-25
Makefile.am
Makefile.am
+1
-1
FlacMetadata.cxx
src/decoder/FlacMetadata.cxx
+1
-1
XiphTags.cxx
src/decoder/XiphTags.cxx
+1
-1
ApeTag.cxx
src/tag/ApeTag.cxx
+4
-0
TagTable.cxx
src/tag/TagTable.cxx
+54
-0
TagTable.hxx
src/tag/TagTable.hxx
+4
-22
No files found.
Makefile.am
View file @
681d6bbd
...
@@ -429,7 +429,7 @@ TAG_LIBS = \
...
@@ -429,7 +429,7 @@ TAG_LIBS = \
$(ID3TAG_LIBS)
$(ID3TAG_LIBS)
libtag_a_SOURCES
=
\
libtag_a_SOURCES
=
\
src/TagTable.hxx
\
src/
tag/TagTable.cxx src/
TagTable.hxx
\
src/tag/ApeLoader.cxx src/tag/ApeLoader.hxx
\
src/tag/ApeLoader.cxx src/tag/ApeLoader.hxx
\
src/tag/ApeReplayGain.cxx src/tag/ApeReplayGain.hxx
\
src/tag/ApeReplayGain.cxx src/tag/ApeReplayGain.hxx
\
src/tag/ApeTag.cxx src/tag/ApeTag.hxx
src/tag/ApeTag.cxx src/tag/ApeTag.hxx
...
...
src/decoder/FlacMetadata.cxx
View file @
681d6bbd
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
#include <glib.h>
#include <glib.h>
#include <assert.h>
#include <assert.h>
#include <st
dlib
.h>
#include <st
ring
.h>
static
bool
static
bool
flac_find_float_comment
(
const
FLAC__StreamMetadata
*
block
,
flac_find_float_comment
(
const
FLAC__StreamMetadata
*
block
,
...
...
src/decoder/XiphTags.cxx
View file @
681d6bbd
...
@@ -24,5 +24,5 @@ const struct tag_table xiph_tags[] = {
...
@@ -24,5 +24,5 @@ const struct tag_table xiph_tags[] = {
{
"tracknumber"
,
TAG_TRACK
},
{
"tracknumber"
,
TAG_TRACK
},
{
"discnumber"
,
TAG_DISC
},
{
"discnumber"
,
TAG_DISC
},
{
"album artist"
,
TAG_ALBUM_ARTIST
},
{
"album artist"
,
TAG_ALBUM_ARTIST
},
{
NULL
,
TAG_NUM_OF_ITEM_TYPES
}
{
nullptr
,
TAG_NUM_OF_ITEM_TYPES
}
};
};
src/tag/ApeTag.cxx
View file @
681d6bbd
...
@@ -24,6 +24,10 @@
...
@@ -24,6 +24,10 @@
#include "TagTable.hxx"
#include "TagTable.hxx"
#include "TagHandler.hxx"
#include "TagHandler.hxx"
#include <glib.h>
#include <string.h>
const
struct
tag_table
ape_tags
[]
=
{
const
struct
tag_table
ape_tags
[]
=
{
{
"album artist"
,
TAG_ALBUM_ARTIST
},
{
"album artist"
,
TAG_ALBUM_ARTIST
},
{
"year"
,
TAG_DATE
},
{
"year"
,
TAG_DATE
},
...
...
src/tag/TagTable.cxx
0 → 100644
View file @
681d6bbd
/*
* 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 "TagTable.hxx"
#include <glib.h>
#include <string.h>
/**
* Looks up a string in a tag translation table (case sensitive).
* Returns TAG_NUM_OF_ITEM_TYPES if the specified name was not found
* in the table.
*/
tag_type
tag_table_lookup
(
const
struct
tag_table
*
table
,
const
char
*
name
)
{
for
(;
table
->
name
!=
nullptr
;
++
table
)
if
(
strcmp
(
name
,
table
->
name
)
==
0
)
return
table
->
type
;
return
TAG_NUM_OF_ITEM_TYPES
;
}
/**
* Looks up a string in a tag translation table (case insensitive).
* Returns TAG_NUM_OF_ITEM_TYPES if the specified name was not found
* in the table.
*/
tag_type
tag_table_lookup_i
(
const
struct
tag_table
*
table
,
const
char
*
name
)
{
for
(;
table
->
name
!=
nullptr
;
++
table
)
if
(
g_ascii_strcasecmp
(
name
,
table
->
name
)
==
0
)
return
table
->
type
;
return
TAG_NUM_OF_ITEM_TYPES
;
}
src/tag/TagTable.hxx
View file @
681d6bbd
...
@@ -23,10 +23,6 @@
...
@@ -23,10 +23,6 @@
#include "TagType.h"
#include "TagType.h"
#include "gcc.h"
#include "gcc.h"
#include <glib.h>
#include <string.h>
struct
tag_table
{
struct
tag_table
{
const
char
*
name
;
const
char
*
name
;
...
@@ -39,15 +35,8 @@ struct tag_table {
...
@@ -39,15 +35,8 @@ struct tag_table {
* in the table.
* in the table.
*/
*/
gcc_pure
gcc_pure
static
inline
enum
tag_type
tag_type
tag_table_lookup
(
const
struct
tag_table
*
table
,
const
char
*
name
)
tag_table_lookup
(
const
tag_table
*
table
,
const
char
*
name
);
{
for
(;
table
->
name
!=
nullptr
;
++
table
)
if
(
strcmp
(
name
,
table
->
name
)
==
0
)
return
table
->
type
;
return
TAG_NUM_OF_ITEM_TYPES
;
}
/**
/**
* Looks up a string in a tag translation table (case insensitive).
* Looks up a string in a tag translation table (case insensitive).
...
@@ -55,14 +44,7 @@ tag_table_lookup(const struct tag_table *table, const char *name)
...
@@ -55,14 +44,7 @@ tag_table_lookup(const struct tag_table *table, const char *name)
* in the table.
* in the table.
*/
*/
gcc_pure
gcc_pure
static
inline
enum
tag_type
tag_type
tag_table_lookup_i
(
const
struct
tag_table
*
table
,
const
char
*
name
)
tag_table_lookup_i
(
const
tag_table
*
table
,
const
char
*
name
);
{
for
(;
table
->
name
!=
nullptr
;
++
table
)
if
(
g_ascii_strcasecmp
(
name
,
table
->
name
)
==
0
)
return
table
->
type
;
return
TAG_NUM_OF_ITEM_TYPES
;
}
#endif
#endif
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment