diff options
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | src/CommandLine.cxx | 2 | ||||
| -rw-r--r-- | src/EncoderList.cxx (renamed from src/encoder_list.c) | 4 | ||||
| -rw-r--r-- | src/EncoderList.hxx (renamed from src/encoder_list.h) | 14 | ||||
| -rw-r--r-- | src/output/HttpdOutputPlugin.cxx | 2 | ||||
| -rw-r--r-- | src/output/RecorderOutputPlugin.cxx | 2 | ||||
| -rw-r--r-- | src/output/ShoutOutputPlugin.cxx | 2 | ||||
| -rw-r--r-- | test/run_encoder.cxx | 2 | ||||
| -rw-r--r-- | test/test_vorbis_encoder.cxx | 2 |
9 files changed, 12 insertions, 21 deletions
diff --git a/Makefile.am b/Makefile.am index cc7a9c294..cb3539021 100644 --- a/Makefile.am +++ b/Makefile.am @@ -64,7 +64,6 @@ mpd_headers = \ src/decoder_api.h \ src/decoder_plugin.h \ src/encoder_plugin.h \ - src/encoder_list.h \ src/encoder_api.h \ src/fd_util.h \ src/gerror.h \ @@ -633,7 +632,7 @@ ENCODER_LIBS = \ libencoder_plugins_a_SOURCES = \ src/encoder/OggStream.hxx \ src/encoder/null_encoder.c \ - src/encoder_list.c + src/EncoderList.cxx src/EncoderList.hxx if ENABLE_WAVE_ENCODER libencoder_plugins_a_SOURCES += src/encoder/wave_encoder.c diff --git a/src/CommandLine.cxx b/src/CommandLine.cxx index ec6d8c7b1..d1f386f82 100644 --- a/src/CommandLine.cxx +++ b/src/CommandLine.cxx @@ -35,7 +35,7 @@ #include "fs/FileSystem.hxx" #ifdef ENABLE_ENCODER -#include "encoder_list.h" +#include "EncoderList.hxx" #include "encoder_plugin.h" #endif diff --git a/src/encoder_list.c b/src/EncoderList.cxx index 029b4be34..e8ec9110e 100644 --- a/src/encoder_list.c +++ b/src/EncoderList.cxx @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2012 The Music Player Daemon Project + * 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 @@ -18,7 +18,7 @@ */ #include "config.h" -#include "encoder_list.h" +#include "EncoderList.hxx" #include "encoder_plugin.h" #include "encoder/VorbisEncoderPlugin.hxx" #include "encoder/OpusEncoderPlugin.hxx" diff --git a/src/encoder_list.h b/src/EncoderList.hxx index 31663c751..69ee8e2bc 100644 --- a/src/encoder_list.h +++ b/src/EncoderList.hxx @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2011 The Music Player Daemon Project + * 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 @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef MPD_ENCODER_LIST_H -#define MPD_ENCODER_LIST_H +#ifndef MPD_ENCODER_LIST_HXX +#define MPD_ENCODER_LIST_HXX struct encoder_plugin; @@ -30,10 +30,6 @@ extern const struct encoder_plugin *const encoder_plugins[]; (plugin = *encoder_plugin_iterator) != NULL; \ ++encoder_plugin_iterator) -#ifdef __cplusplus -extern "C" { -#endif - /** * Looks up an encoder plugin by its name. * @@ -44,8 +40,4 @@ extern "C" { const struct encoder_plugin * encoder_plugin_get(const char *name); -#ifdef __cplusplus -} -#endif - #endif diff --git a/src/output/HttpdOutputPlugin.cxx b/src/output/HttpdOutputPlugin.cxx index cb515e657..bb644c318 100644 --- a/src/output/HttpdOutputPlugin.cxx +++ b/src/output/HttpdOutputPlugin.cxx @@ -23,7 +23,7 @@ #include "HttpdClient.hxx" #include "output_api.h" #include "encoder_plugin.h" -#include "encoder_list.h" +#include "EncoderList.hxx" #include "resolver.h" #include "Page.hxx" #include "IcyMetaDataServer.hxx" diff --git a/src/output/RecorderOutputPlugin.cxx b/src/output/RecorderOutputPlugin.cxx index 8b821d773..7d15ed4b6 100644 --- a/src/output/RecorderOutputPlugin.cxx +++ b/src/output/RecorderOutputPlugin.cxx @@ -21,7 +21,7 @@ #include "RecorderOutputPlugin.hxx" #include "output_api.h" #include "encoder_plugin.h" -#include "encoder_list.h" +#include "EncoderList.hxx" #include "fd_util.h" #include "open.h" diff --git a/src/output/ShoutOutputPlugin.cxx b/src/output/ShoutOutputPlugin.cxx index d95a7eae6..7662e33ab 100644 --- a/src/output/ShoutOutputPlugin.cxx +++ b/src/output/ShoutOutputPlugin.cxx @@ -21,7 +21,7 @@ #include "ShoutOutputPlugin.hxx" #include "output_api.h" #include "encoder_plugin.h" -#include "encoder_list.h" +#include "EncoderList.hxx" #include "mpd_error.h" #include <shout/shout.h> diff --git a/test/run_encoder.cxx b/test/run_encoder.cxx index 9039f2db5..91993c95a 100644 --- a/test/run_encoder.cxx +++ b/test/run_encoder.cxx @@ -18,7 +18,7 @@ */ #include "config.h" -#include "encoder_list.h" +#include "EncoderList.hxx" #include "encoder_plugin.h" #include "audio_format.h" #include "AudioParser.hxx" diff --git a/test/test_vorbis_encoder.cxx b/test/test_vorbis_encoder.cxx index 0e502b154..7ac36e3ec 100644 --- a/test/test_vorbis_encoder.cxx +++ b/test/test_vorbis_encoder.cxx @@ -18,7 +18,7 @@ */ #include "config.h" -#include "encoder_list.h" +#include "EncoderList.hxx" #include "encoder_plugin.h" #include "audio_format.h" #include "conf.h" |