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

db/upnp: move upnp_tags to Tags.cxx

Browse Source
This commit is contained in:
Max Kellermann 2014-01-14 21:36:02 +01:00
parent 70d3ad3ca1
commit 4bcaf5d306
4 changed files with 63 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -413,6 +413,7 @@ DB_LIBS = \
if HAVE_LIBUPNP if HAVE_LIBUPNP
libdb_plugins_a_SOURCES += \ libdb_plugins_a_SOURCES += \
src/db/UpnpDatabasePlugin.cxx src/db/UpnpDatabasePlugin.hxx \ src/db/UpnpDatabasePlugin.cxx src/db/UpnpDatabasePlugin.hxx \
src/db/upnp/Tags.cxx src/db/upnp/Tags.hxx \
src/db/upnp/ContentDirectoryService.cxx src/db/upnp/ContentDirectoryService.hxx \ src/db/upnp/ContentDirectoryService.cxx src/db/upnp/ContentDirectoryService.hxx \
src/db/upnp/Device.cxx src/db/upnp/Device.hxx \ src/db/upnp/Device.cxx src/db/upnp/Device.hxx \
src/db/upnp/Directory.cxx src/db/upnp/Directory.hxx \ src/db/upnp/Directory.cxx src/db/upnp/Directory.hxx \

12
src/db/UpnpDatabasePlugin.cxx
View File

@ -24,6 +24,7 @@
#include "upnp/Discovery.hxx" #include "upnp/Discovery.hxx"
#include "upnp/ContentDirectoryService.hxx" #include "upnp/ContentDirectoryService.hxx"
#include "upnp/Directory.hxx" #include "upnp/Directory.hxx"
#include "upnp/Tags.hxx"
#include "upnp/Util.hxx" #include "upnp/Util.hxx"
#include "LazyDatabase.hxx" #include "LazyDatabase.hxx"
#include "DatabasePlugin.hxx" #include "DatabasePlugin.hxx"
@ -50,17 +51,6 @@
static const char *const rootid = "0"; static const char *const rootid = "0";
static const struct tag_table upnp_tags[] = {
{ "upnp:artist", TAG_ARTIST },
{ "upnp:album", TAG_ALBUM },
{ "upnp:originalTrackNumber", TAG_TRACK },
{ "upnp:genre", TAG_GENRE },
{ "dc:title", TAG_TITLE },
/* sentinel */
{ nullptr, TAG_NUM_OF_ITEM_TYPES }
};
class UpnpDatabase : public Database { class UpnpDatabase : public Database {
LibUPnP *m_lib; LibUPnP *m_lib;
UPnPDeviceDirectory *m_superdir; UPnPDeviceDirectory *m_superdir;

33
src/db/upnp/Tags.cxx Normal file
View File

@ -0,0 +1,33 @@
/*
* 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 "Tags.hxx"
#include "tag/TagTable.hxx"
const struct tag_table upnp_tags[] = {
{ "upnp:artist", TAG_ARTIST },
{ "upnp:album", TAG_ALBUM },
{ "upnp:originalTrackNumber", TAG_TRACK },
{ "upnp:genre", TAG_GENRE },
{ "dc:title", TAG_TITLE },
/* sentinel */
{ nullptr, TAG_NUM_OF_ITEM_TYPES }
};

28
src/db/upnp/Tags.hxx Normal file
View File

@ -0,0 +1,28 @@
/*
* 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_UPNP_TAGS_HXX
#define MPD_UPNP_TAGS_HXX
/**
* Map UPnP property names to MPD tags.
*/
extern const struct tag_table upnp_tags[];
#endif