From 636f5d4a1d983cdbb43b23da0da9c5db4a91f71f Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 18 Aug 2014 10:12:37 +0200 Subject: {input,decoder}/ffmpeg: move ffmpeg_domain to lib/ffmpeg/Domain.cxx Eliminate duplicate definition (in input plugin and decoder plugin). --- src/lib/ffmpeg/Domain.cxx | 24 ++++++++++++++++++++++++ src/lib/ffmpeg/Domain.hxx | 27 +++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 src/lib/ffmpeg/Domain.cxx create mode 100644 src/lib/ffmpeg/Domain.hxx (limited to 'src/lib/ffmpeg') diff --git a/src/lib/ffmpeg/Domain.cxx b/src/lib/ffmpeg/Domain.cxx new file mode 100644 index 000000000..78db30bae --- /dev/null +++ b/src/lib/ffmpeg/Domain.cxx @@ -0,0 +1,24 @@ +/* + * 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 "Domain.hxx" +#include "util/Domain.hxx" + +const Domain ffmpeg_domain("ffmpeg"); diff --git a/src/lib/ffmpeg/Domain.hxx b/src/lib/ffmpeg/Domain.hxx new file mode 100644 index 000000000..f21498a32 --- /dev/null +++ b/src/lib/ffmpeg/Domain.hxx @@ -0,0 +1,27 @@ +/* + * 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_FFMPEG_DOMAIN_HXX +#define MPD_FFMPEG_DOMAIN_HXX + +class Domain; + +extern const Domain ffmpeg_domain; + +#endif -- cgit v1.2.3