Commit 9e5d2c5b authored by Max Kellermann's avatar Max Kellermann

encoder_list: convert to C++

parent 2df2a989
...@@ -64,7 +64,6 @@ mpd_headers = \ ...@@ -64,7 +64,6 @@ mpd_headers = \
src/decoder_api.h \ src/decoder_api.h \
src/decoder_plugin.h \ src/decoder_plugin.h \
src/encoder_plugin.h \ src/encoder_plugin.h \
src/encoder_list.h \
src/encoder_api.h \ src/encoder_api.h \
src/fd_util.h \ src/fd_util.h \
src/gerror.h \ src/gerror.h \
...@@ -633,7 +632,7 @@ ENCODER_LIBS = \ ...@@ -633,7 +632,7 @@ ENCODER_LIBS = \
libencoder_plugins_a_SOURCES = \ libencoder_plugins_a_SOURCES = \
src/encoder/OggStream.hxx \ src/encoder/OggStream.hxx \
src/encoder/null_encoder.c \ src/encoder/null_encoder.c \
src/encoder_list.c src/EncoderList.cxx src/EncoderList.hxx
if ENABLE_WAVE_ENCODER if ENABLE_WAVE_ENCODER
libencoder_plugins_a_SOURCES += src/encoder/wave_encoder.c libencoder_plugins_a_SOURCES += src/encoder/wave_encoder.c
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include "fs/FileSystem.hxx" #include "fs/FileSystem.hxx"
#ifdef ENABLE_ENCODER #ifdef ENABLE_ENCODER
#include "encoder_list.h" #include "EncoderList.hxx"
#include "encoder_plugin.h" #include "encoder_plugin.h"
#endif #endif
......
/* /*
* Copyright (C) 2003-2012 The Music Player Daemon Project * Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org * http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
*/ */
#include "config.h" #include "config.h"
#include "encoder_list.h" #include "EncoderList.hxx"
#include "encoder_plugin.h" #include "encoder_plugin.h"
#include "encoder/VorbisEncoderPlugin.hxx" #include "encoder/VorbisEncoderPlugin.hxx"
#include "encoder/OpusEncoderPlugin.hxx" #include "encoder/OpusEncoderPlugin.hxx"
......
/* /*
* Copyright (C) 2003-2011 The Music Player Daemon Project * Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org * http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#ifndef MPD_ENCODER_LIST_H #ifndef MPD_ENCODER_LIST_HXX
#define MPD_ENCODER_LIST_H #define MPD_ENCODER_LIST_HXX
struct encoder_plugin; struct encoder_plugin;
...@@ -30,10 +30,6 @@ extern const struct encoder_plugin *const encoder_plugins[]; ...@@ -30,10 +30,6 @@ extern const struct encoder_plugin *const encoder_plugins[];
(plugin = *encoder_plugin_iterator) != NULL; \ (plugin = *encoder_plugin_iterator) != NULL; \
++encoder_plugin_iterator) ++encoder_plugin_iterator)
#ifdef __cplusplus
extern "C" {
#endif
/** /**
* Looks up an encoder plugin by its name. * Looks up an encoder plugin by its name.
* *
...@@ -44,8 +40,4 @@ extern "C" { ...@@ -44,8 +40,4 @@ extern "C" {
const struct encoder_plugin * const struct encoder_plugin *
encoder_plugin_get(const char *name); encoder_plugin_get(const char *name);
#ifdef __cplusplus
}
#endif
#endif #endif
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "HttpdClient.hxx" #include "HttpdClient.hxx"
#include "output_api.h" #include "output_api.h"
#include "encoder_plugin.h" #include "encoder_plugin.h"
#include "encoder_list.h" #include "EncoderList.hxx"
#include "resolver.h" #include "resolver.h"
#include "Page.hxx" #include "Page.hxx"
#include "IcyMetaDataServer.hxx" #include "IcyMetaDataServer.hxx"
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "RecorderOutputPlugin.hxx" #include "RecorderOutputPlugin.hxx"
#include "output_api.h" #include "output_api.h"
#include "encoder_plugin.h" #include "encoder_plugin.h"
#include "encoder_list.h" #include "EncoderList.hxx"
#include "fd_util.h" #include "fd_util.h"
#include "open.h" #include "open.h"
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "ShoutOutputPlugin.hxx" #include "ShoutOutputPlugin.hxx"
#include "output_api.h" #include "output_api.h"
#include "encoder_plugin.h" #include "encoder_plugin.h"
#include "encoder_list.h" #include "EncoderList.hxx"
#include "mpd_error.h" #include "mpd_error.h"
#include <shout/shout.h> #include <shout/shout.h>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
*/ */
#include "config.h" #include "config.h"
#include "encoder_list.h" #include "EncoderList.hxx"
#include "encoder_plugin.h" #include "encoder_plugin.h"
#include "audio_format.h" #include "audio_format.h"
#include "AudioParser.hxx" #include "AudioParser.hxx"
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
*/ */
#include "config.h" #include "config.h"
#include "encoder_list.h" #include "EncoderList.hxx"
#include "encoder_plugin.h" #include "encoder_plugin.h"
#include "audio_format.h" #include "audio_format.h"
#include "conf.h" #include "conf.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment