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

decoder_list: convert to C++

Browse Source
This commit is contained in:
Max Kellermann 2013-01-30 17:18:48 +01:00
parent 8142080633
commit 01dd540d7e
14 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -77,7 +77,6 @@ mpd_headers = \
src/gerror.h \ src/gerror.h \
src/glib_compat.h \ src/glib_compat.h \
src/gcc.h \ src/gcc.h \
src/decoder_list.h \
src/decoder/pcm_decoder_plugin.h \ src/decoder/pcm_decoder_plugin.h \
src/input_stream.h \ src/input_stream.h \
src/text_input_stream.h \ src/text_input_stream.h \
@ -465,7 +464,7 @@ libdecoder_plugins_a_SOURCES = \
src/decoder/dsdlib.h \ src/decoder/dsdlib.h \
src/decoder_buffer.c \ src/decoder_buffer.c \
src/decoder_plugin.c \ src/decoder_plugin.c \
src/decoder_list.c src/DecoderList.cxx src/DecoderList.hxx
libdecoder_plugins_a_CPPFLAGS = $(AM_CPPFLAGS) \ libdecoder_plugins_a_CPPFLAGS = $(AM_CPPFLAGS) \
$(VORBIS_CFLAGS) $(TREMOR_CFLAGS) \ $(VORBIS_CFLAGS) $(TREMOR_CFLAGS) \
$(patsubst -I%/FLAC,-I%,$(FLAC_CFLAGS)) \ $(patsubst -I%/FLAC,-I%,$(FLAC_CFLAGS)) \

2
src/CommandLine.cxx
View File

@ -22,7 +22,7 @@
#include "ls.hxx" #include "ls.hxx"
#include "Log.hxx" #include "Log.hxx"
#include "conf.h" #include "conf.h"
#include "decoder_list.h" #include "DecoderList.hxx"
#include "decoder_plugin.h" #include "decoder_plugin.h"
#include "OutputList.hxx" #include "OutputList.hxx"
#include "output_plugin.h" #include "output_plugin.h"

4
src/decoder_list.c → src/DecoderList.cxx
View File

@ -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 * 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 @@
*/ */
#include "config.h" #include "config.h"
#include "decoder_list.h" #include "DecoderList.hxx"
#include "decoder_plugin.h" #include "decoder_plugin.h"
#include "conf.h" #include "conf.h"
#include "mpd_error.h" #include "mpd_error.h"

8
src/decoder_list.h → src/DecoderList.hxx
View File

@ -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 * 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,10 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#ifndef MPD_DECODER_LIST_H #ifndef MPD_DECODER_LIST_HXX
#define MPD_DECODER_LIST_H #define MPD_DECODER_LIST_HXX
#include <stdbool.h>
struct decoder_plugin; struct decoder_plugin;

2
src/DecoderPrint.cxx
View File

@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#include "DecoderPrint.hxx" #include "DecoderPrint.hxx"
#include "decoder_list.h" #include "DecoderList.hxx"
#include "decoder_plugin.h" #include "decoder_plugin.h"
#include "Client.hxx" #include "Client.hxx"

2
src/DecoderThread.cxx
View File

@ -30,9 +30,9 @@
#include "decoder_api.h" #include "decoder_api.h"
#include "tag.h" #include "tag.h"
#include "InputStream.hxx" #include "InputStream.hxx"
#include "DecoderList.hxx"
extern "C" { extern "C" {
#include "decoder_list.h"
#include "replay_gain_ape.h" #include "replay_gain_ape.h"
#include "uri.h" #include "uri.h"
} }

2
src/Main.cxx
View File

@ -50,13 +50,13 @@
#include "fs/Path.hxx" #include "fs/Path.hxx"
#include "PlaylistRegistry.hxx" #include "PlaylistRegistry.hxx"
#include "ZeroconfGlue.hxx" #include "ZeroconfGlue.hxx"
#include "DecoderList.hxx"
extern "C" { extern "C" {
#include "daemon.h" #include "daemon.h"
#include "stats.h" #include "stats.h"
#include "audio_config.h" #include "audio_config.h"
#include "pcm_resample.h" #include "pcm_resample.h"
#include "decoder_list.h"
} }
#include "mpd_error.h" #include "mpd_error.h"

4
src/SongUpdate.cxx
View File

@ -29,10 +29,10 @@ extern "C" {
#include "fs/Path.hxx" #include "fs/Path.hxx"
#include "tag.h" #include "tag.h"
#include "input_stream.h" #include "input_stream.h"
#include "decoder_plugin.h"
#include "DecoderList.hxx"
extern "C" { extern "C" {
#include "decoder_list.h"
#include "decoder_plugin.h"
#include "tag_ape.h" #include "tag_ape.h"
#include "tag_id3.h" #include "tag_id3.h"
#include "tag_handler.h" #include "tag_handler.h"

2
src/TagFile.cxx
View File

@ -22,9 +22,9 @@
extern "C" { extern "C" {
#include "uri.h" #include "uri.h"
#include "decoder_list.h"
} }
#include "DecoderList.hxx"
#include "decoder_plugin.h" #include "decoder_plugin.h"
#include "input_stream.h" #include "input_stream.h"

5
src/UpdateSong.cxx
View File

@ -27,10 +27,7 @@
#include "Directory.hxx" #include "Directory.hxx"
#include "song.h" #include "song.h"
#include "decoder_plugin.h" #include "decoder_plugin.h"
#include "DecoderList.hxx"
extern "C" {
#include "decoder_list.h"
}
#include <glib.h> #include <glib.h>

8
src/decoder_plugin.h
View File

@ -190,6 +190,10 @@ decoder_plugin_container_scan( const struct decoder_plugin *plugin,
return plugin->container_scan(pathname, tnum); return plugin->container_scan(pathname, tnum);
} }
#ifdef __cplusplus
extern "C" {
#endif
/** /**
* Does the plugin announce the specified file name suffix? * Does the plugin announce the specified file name suffix?
*/ */
@ -204,4 +208,8 @@ bool
decoder_plugin_supports_mime_type(const struct decoder_plugin *plugin, decoder_plugin_supports_mime_type(const struct decoder_plugin *plugin,
const char *mime_type); const char *mime_type);
#ifdef __cplusplus
}
#endif
#endif #endif

5
test/dump_playlist.cxx
View File

@ -24,16 +24,13 @@
#include "input_stream.h" #include "input_stream.h"
#include "conf.h" #include "conf.h"
#include "decoder_api.h" #include "decoder_api.h"
#include "DecoderList.hxx"
#include "InputInit.hxx" #include "InputInit.hxx"
#include "IOThread.hxx" #include "IOThread.hxx"
#include "PlaylistRegistry.hxx" #include "PlaylistRegistry.hxx"
#include "PlaylistPlugin.hxx" #include "PlaylistPlugin.hxx"
#include "fs/Path.hxx" #include "fs/Path.hxx"
extern "C" {
#include "decoder_list.h"
}
#include <glib.h> #include <glib.h>
#include <unistd.h> #include <unistd.h>

4
test/read_tags.cxx
View File

@ -19,9 +19,7 @@
#include "config.h" #include "config.h"
#include "IOThread.hxx" #include "IOThread.hxx"
extern "C" { #include "DecoderList.hxx"
#include "decoder_list.h"
}
#include "decoder_api.h" #include "decoder_api.h"
#include "InputInit.hxx" #include "InputInit.hxx"
#include "InputStream.hxx" #include "InputStream.hxx"

4
test/run_decoder.cxx
View File

@ -19,9 +19,7 @@
#include "config.h" #include "config.h"
#include "IOThread.hxx" #include "IOThread.hxx"
extern "C" { #include "DecoderList.hxx"
#include "decoder_list.h"
}
#include "decoder_api.h" #include "decoder_api.h"
#include "InputInit.hxx" #include "InputInit.hxx"
#include "input_stream.h" #include "input_stream.h"