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

tag: moved code to tag_print.c

Browse Source 
Move everything which dumps a tag to a file descriptor to tag_print.c.
This relaxes dependencies and splits the code into smaller parts.
This commit is contained in:
Max Kellermann 2008-09-07 13:28:01 +02:00
parent f73319c048
commit 386c303121
8 changed files with 105 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile.am
View File

@ -82,8 +82,10 @@ mpd_headers = \
state_file.h \
stats.h \
tag.h \
tag_internal.h \
tag_pool.h \
tag_id3.h \
tag_print.h \
tagTracker.h \
utf8.h \
utils.h \
@ -147,6 +149,7 @@ mpd_SOURCES = \
tag.c \
tag_pool.c \
tag_id3.c \
tag_print.c \
tagTracker.c \
utils.c \
volume.c \

1
src/command.c
View File

@ -36,6 +36,7 @@
#include "dbUtils.h"
#include "tag.h"
#include "client.h"
#include "tag_print.h"
#include "os_compat.h"
#define COMMAND_PLAY "play"

1
src/song.c
View File

@ -27,6 +27,7 @@
#include "decoder_list.h"
#include "decoder_api.h"
#include "myfprintf.h"
#include "tag_print.h"
#define SONG_KEY "key: "
#define SONG_MTIME "mtime: "

27
src/tag.c
View File

@ -17,8 +17,8 @@
*/
#include "tag.h"
#include "tag_internal.h"
#include "tag_pool.h"
#include "myfprintf.h"
#include "utils.h"
#include "utf8.h"
#include "log.h"
@ -53,7 +53,7 @@ const char *mpdTagItemKeys[TAG_NUM_OF_ITEM_TYPES] = {
"Disc"
};
static mpd_sint8 ignoreTagItems[TAG_NUM_OF_ITEM_TYPES];
mpd_sint8 ignoreTagItems[TAG_NUM_OF_ITEM_TYPES];
void tag_lib_init(void)
{
@ -104,29 +104,6 @@ void tag_lib_init(void)
free(temp);
}
void tag_print_types(int fd)
{
int i;
for (i = 0; i < TAG_NUM_OF_ITEM_TYPES; i++) {
if (ignoreTagItems[i] == 0)
fdprintf(fd, "tagtype: %s\n", mpdTagItemKeys[i]);
}
}
void tag_print(int fd, const struct tag *tag)
{
int i;
if (tag->time >= 0)
fdprintf(fd, SONG_TIME "%i\n", tag->time);
for (i = 0; i < tag->numOfItems; i++) {
fdprintf(fd, "%s: %s\n", mpdTagItemKeys[tag->items[i]->type],
tag->items[i]->value);
}
}
struct tag *tag_ape_load(const char *file)
{
struct tag *ret = NULL;

4
src/tag.h
View File

@ -84,10 +84,6 @@ static inline void tag_add_item(struct tag *tag, enum tag_type itemType,
tag_add_item_n(tag, itemType, value, strlen(value));
}
void tag_print_types(int fd);
void tag_print(int fd, const struct tag *tag);
struct tag *tag_dup(const struct tag *tag);
int tag_equal(const struct tag *tag1, const struct tag *tag2);

24
src/tag_internal.h Normal file
View File

@ -0,0 +1,24 @@
/* the Music Player Daemon (MPD)
* Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef TAG_INTERNAL_H
#define TAG_INTERNAL_H
extern mpd_sint8 ignoreTagItems[TAG_NUM_OF_ITEM_TYPES];
#endif

46
src/tag_print.c Normal file
View File

@ -0,0 +1,46 @@
/* the Music Player Daemon (MPD)
* Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "tag_print.h"
#include "tag.h"
#include "tag_internal.h"
#include "myfprintf.h"
#include "song.h"
void tag_print_types(int fd)
{
int i;
for (i = 0; i < TAG_NUM_OF_ITEM_TYPES; i++) {
if (ignoreTagItems[i] == 0)
fdprintf(fd, "tagtype: %s\n", mpdTagItemKeys[i]);
}
}
void tag_print(int fd, const struct tag *tag)
{
int i;
if (tag->time >= 0)
fdprintf(fd, SONG_TIME "%i\n", tag->time);
for (i = 0; i < tag->numOfItems; i++) {
fdprintf(fd, "%s: %s\n", mpdTagItemKeys[tag->items[i]->type],
tag->items[i]->value);
}
}

28
src/tag_print.h Normal file
View File

@ -0,0 +1,28 @@
/* the Music Player Daemon (MPD)
* Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef TAG_PRINT_H
#define TAG_PRINT_H
struct tag;
void tag_print_types(int fd);
void tag_print(int fd, const struct tag *tag);
#endif