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

Archive*: move archive_domain to ArchiveDomain.cxx

Browse Source 
Merge duplicate symbol.
This commit is contained in:
Max Kellermann 2013-10-15 23:24:54 +02:00
parent d4c2f91182
commit fa13a6616f
5 changed files with 51 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -363,6 +363,7 @@ src_mpd_SOURCES += \
src/UpdateArchive.cxx src/UpdateArchive.hxx
libarchive_a_SOURCES = \
src/ArchiveDomain.cxx src/ArchiveDomain.hxx \
src/ArchiveLookup.cxx src/ArchiveLookup.hxx \
src/ArchiveList.cxx src/ArchiveList.hxx \
src/ArchivePlugin.cxx src/ArchivePlugin.hxx \

23
src/ArchiveDomain.cxx Normal file
View File

@ -0,0 +1,23 @@
/*
* 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 "ArchiveDomain.hxx"
#include "util/Domain.hxx"
const Domain archive_domain("archive");

25
src/ArchiveDomain.hxx 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.
*/
#ifndef MPD_ARCHIVE_DOMAIN_HXX
#define MPD_ARCHIVE_DOMAIN_HXX
extern const class Domain archive_domain;
#endif

4
src/ArchiveLookup.cxx
View File

@ -19,7 +19,7 @@
#include "config.h" /* must be first for large file support */
#include "ArchiveLookup.hxx"
#include "util/Domain.hxx"
#include "ArchiveDomain.hxx"
#include "Log.hxx"
#include <glib.h>
@ -29,8 +29,6 @@
#include <unistd.h>
#include <errno.h>
static constexpr Domain archive_domain("archive");
/**
*
* archive_lookup is used to determine if part of pathname refers to an regular

4
src/input/ArchiveInputPlugin.cxx
View File

@ -19,20 +19,18 @@
#include "config.h"
#include "ArchiveInputPlugin.hxx"
#include "ArchiveDomain.hxx"
#include "ArchiveLookup.hxx"
#include "ArchiveList.hxx"
#include "ArchivePlugin.hxx"
#include "ArchiveFile.hxx"
#include "InputPlugin.hxx"
#include "util/Error.hxx"
#include "util/Domain.hxx"
#include "fs/Path.hxx"
#include "Log.hxx"
#include <glib.h>
static constexpr Domain archive_domain("archive");
/**
* select correct archive plugin to handle the input stream
* may allow stacking of archive plugins. for example for handling