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

include cleanup

Browse Source
This commit is contained in:
Max Kellermann 2013-07-30 08:39:21 +02:00
parent 648196319f
commit 28030d7edb
22 changed files with 8 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ApeTag.hxx
View File

@ -22,8 +22,6 @@
#include "TagTable.hxx" #include "TagTable.hxx"
#include <stdbool.h>
struct tag_handler; struct tag_handler;
extern const struct tag_table ape_tags[]; extern const struct tag_table ape_tags[];

2
src/ClientFile.hxx
View File

@ -22,8 +22,6 @@
#include "gerror.h" #include "gerror.h"
#include <stdbool.h>
class Client; class Client;
class Path; class Path;

2
src/ConfigData.hxx
View File

@ -30,8 +30,6 @@
#include <vector> #include <vector>
#endif #endif
#include <stdbool.h>
#ifdef __cplusplus #ifdef __cplusplus
struct block_param { struct block_param {

19
src/DecoderPlugin.hxx
View File

@ -20,9 +20,6 @@
#ifndef MPD_DECODER_PLUGIN_HXX #ifndef MPD_DECODER_PLUGIN_HXX
#define MPD_DECODER_PLUGIN_HXX #define MPD_DECODER_PLUGIN_HXX
#include <stdbool.h>
#include <stddef.h>
struct config_param; struct config_param;
struct input_stream; struct input_stream;
struct tag; struct tag;
@ -40,7 +37,7 @@ struct decoder_plugin {
/** /**
* Initialize the decoder plugin. Optional method. * Initialize the decoder plugin. Optional method.
* *
* @param param a configuration block for this plugin, or NULL * @param param a configuration block for this plugin, or nullptr
* if none is configured * if none is configured
* @return true if the plugin was initialized successfully, * @return true if the plugin was initialized successfully,
* false if the plugin is not available * false if the plugin is not available
@ -94,13 +91,13 @@ struct decoder_plugin {
* @param const char* pathname full pathname for the file on fs * @param const char* pathname full pathname for the file on fs
* @param const unsigned int tnum track number * @param const unsigned int tnum track number
* *
* @return NULL if there are no multiple files * @return nullptr if there are no multiple files
* a filename for every single track according to tnum (param 2) * a filename for every single track according to tnum (param 2)
* do not include full pathname here, just the "virtual" file * do not include full pathname here, just the "virtual" file
*/ */
char* (*container_scan)(const char *path_fs, const unsigned int tnum); char* (*container_scan)(const char *path_fs, const unsigned int tnum);
/* last element in these arrays must always be a NULL: */ /* last element in these arrays must always be a nullptr: */
const char *const*suffixes; const char *const*suffixes;
const char *const*mime_types; const char *const*mime_types;
}; };
@ -108,7 +105,7 @@ struct decoder_plugin {
/** /**
* Initialize a decoder plugin. * Initialize a decoder plugin.
* *
* @param param a configuration block for this plugin, or NULL if none * @param param a configuration block for this plugin, or nullptr if none
* is configured * is configured
* @return true if the plugin was initialized successfully, false if * @return true if the plugin was initialized successfully, false if
* the plugin is not available * the plugin is not available
@ -117,7 +114,7 @@ static inline bool
decoder_plugin_init(const struct decoder_plugin *plugin, decoder_plugin_init(const struct decoder_plugin *plugin,
const struct config_param *param) const struct config_param *param)
{ {
return plugin->init != NULL return plugin->init != nullptr
? plugin->init(param) ? plugin->init(param)
: true; : true;
} }
@ -128,7 +125,7 @@ decoder_plugin_init(const struct decoder_plugin *plugin,
static inline void static inline void
decoder_plugin_finish(const struct decoder_plugin *plugin) decoder_plugin_finish(const struct decoder_plugin *plugin)
{ {
if (plugin->finish != NULL) if (plugin->finish != nullptr)
plugin->finish(); plugin->finish();
} }
@ -160,7 +157,7 @@ decoder_plugin_scan_file(const struct decoder_plugin *plugin,
const char *path_fs, const char *path_fs,
const struct tag_handler *handler, void *handler_ctx) const struct tag_handler *handler, void *handler_ctx)
{ {
return plugin->scan_file != NULL return plugin->scan_file != nullptr
? plugin->scan_file(path_fs, handler, handler_ctx) ? plugin->scan_file(path_fs, handler, handler_ctx)
: false; : false;
} }
@ -174,7 +171,7 @@ decoder_plugin_scan_stream(const struct decoder_plugin *plugin,
const struct tag_handler *handler, const struct tag_handler *handler,
void *handler_ctx) void *handler_ctx)
{ {
return plugin->scan_stream != NULL return plugin->scan_stream != nullptr
? plugin->scan_stream(is, handler, handler_ctx) ? plugin->scan_stream(is, handler, handler_ctx)
: false; : false;
} }

1
src/Directory.hxx
View File

@ -27,7 +27,6 @@
#include "PlaylistVector.hxx" #include "PlaylistVector.hxx"
#include "gerror.h" #include "gerror.h"
#include <stdbool.h>
#include <sys/types.h> #include <sys/types.h>
#define DEVICE_INARCHIVE (dev_t)(-1) #define DEVICE_INARCHIVE (dev_t)(-1)

2
src/Listen.hxx
View File

@ -22,8 +22,6 @@
#include "gerror.h" #include "gerror.h"
#include <stdbool.h>
extern int listen_port; extern int listen_port;
bool bool

1
src/Log.hxx
View File

@ -21,7 +21,6 @@
#define MPD_LOG_HXX #define MPD_LOG_HXX
#include <glib.h> #include <glib.h>
#include <stdbool.h>
G_GNUC_CONST G_GNUC_CONST
static inline GQuark static inline GQuark

2
src/MixerPlugin.hxx
View File

@ -29,8 +29,6 @@
#include "gerror.h" #include "gerror.h"
#include <stdbool.h>
struct config_param; struct config_param;
class Mixer; class Mixer;

3
src/OutputAll.hxx
View File

@ -29,9 +29,6 @@
#include "replay_gain_info.h" #include "replay_gain_info.h"
#include "gerror.h" #include "gerror.h"
#include <stdbool.h>
#include <stddef.h>
struct audio_format; struct audio_format;
struct music_buffer; struct music_buffer;
struct music_chunk; struct music_chunk;

1
src/OutputPlugin.hxx
View File

@ -23,7 +23,6 @@
#include "gcc.h" #include "gcc.h"
#include "gerror.h" #include "gerror.h"
#include <stdbool.h>
#include <stddef.h> #include <stddef.h>
struct config_param; struct config_param;

1
src/Permission.cxx
View File

@ -27,7 +27,6 @@
#include <glib.h> #include <glib.h>
#include <stdbool.h>
#include <string.h> #include <string.h>
#define PERMISSION_PASSWORD_CHAR '@' #define PERMISSION_PASSWORD_CHAR '@'

2
src/Playlist.hxx
View File

@ -23,8 +23,6 @@
#include "Queue.hxx" #include "Queue.hxx"
#include "playlist_error.h" #include "playlist_error.h"
#include <stdbool.h>
struct player_control; struct player_control;
struct Song; struct Song;

2
src/Song.hxx
View File

@ -24,8 +24,6 @@
#include "gcc.h" #include "gcc.h"
#include <assert.h> #include <assert.h>
#include <stddef.h>
#include <stdbool.h>
#include <sys/time.h> #include <sys/time.h>
#define SONG_FILE "file: " #define SONG_FILE "file: "

2
src/TagFile.hxx
View File

@ -22,8 +22,6 @@
#include "check.h" #include "check.h"
#include <stdbool.h>
struct tag_handler; struct tag_handler;
/** /**

2
src/TagId3.hxx
View File

@ -24,8 +24,6 @@
#include "gcc.h" #include "gcc.h"
#include "gerror.h" #include "gerror.h"
#include <stdbool.h>
struct tag_handler; struct tag_handler;
struct tag; struct tag;

2
src/TagRva2.hxx
View File

@ -22,8 +22,6 @@
#include "check.h" #include "check.h"
#include <stdbool.h>
struct id3_tag; struct id3_tag;
struct replay_gain_info; struct replay_gain_info;

2
src/decoder/VorbisComments.hxx
View File

@ -22,8 +22,6 @@
#include "check.h" #include "check.h"
#include <stdbool.h>
struct replay_gain_info; struct replay_gain_info;
struct tag_handler; struct tag_handler;

2
src/output/PulseOutputPlugin.hxx
View File

@ -22,8 +22,6 @@
#include "gerror.h" #include "gerror.h"
#include <stdbool.h>
struct PulseOutput; struct PulseOutput;
struct PulseMixer; struct PulseMixer;
struct pa_cvolume; struct pa_cvolume;

1
src/pcm/PcmResample.hxx
View File

@ -25,7 +25,6 @@
#include <stdint.h> #include <stdint.h>
#include <stddef.h> #include <stddef.h>
#include <stdbool.h>
#ifdef HAVE_LIBSAMPLERATE #ifdef HAVE_LIBSAMPLERATE
#include <samplerate.h> #include <samplerate.h>

1
src/pcm/PcmVolume.hxx
View File

@ -24,7 +24,6 @@
#include "audio_format.h" #include "audio_format.h"
#include <stdint.h> #include <stdint.h>
#include <stdbool.h>
#include <stddef.h> #include <stddef.h>
enum { enum {

1
src/protocol/ArgParser.hxx
View File

@ -22,7 +22,6 @@
#include "check.h" #include "check.h"
#include <stdbool.h>
#include <stdint.h> #include <stdint.h>
class Client; class Client;

1
src/util/Tokenizer.cxx
View File

@ -23,7 +23,6 @@
#include <glib.h> #include <glib.h>
#include <stdbool.h>
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>