diff options
Diffstat (limited to '')
29 files changed, 42 insertions, 24 deletions
diff --git a/src/decoder/.#flac_plugin.c b/src/decoder/.#flac_plugin.c new file mode 120000 index 000000000..d86abda4a --- /dev/null +++ b/src/decoder/.#flac_plugin.c @@ -0,0 +1 @@ +max@woodpecker.roonstrasse.net.11431:1257744648
\ No newline at end of file diff --git a/src/decoder/_flac_common.c b/src/decoder/_flac_common.c index 70fc2cbcc..77483efcb 100644 --- a/src/decoder/_flac_common.c +++ b/src/decoder/_flac_common.c @@ -21,6 +21,7 @@ * Common data structures and functions used by FLAC and OggFLAC */ +#include "config.h" #include "_flac_common.h" #include "flac_metadata.h" #include "flac_pcm.h" diff --git a/src/decoder/_ogg_common.c b/src/decoder/_ogg_common.c index 6c6553422..d838e0ff4 100644 --- a/src/decoder/_ogg_common.c +++ b/src/decoder/_ogg_common.c @@ -21,8 +21,8 @@ * Common functions used for Ogg data streams (Ogg-Vorbis and OggFLAC) */ +#include "config.h" #include "_ogg_common.h" -#include "../utils.h" ogg_stream_type ogg_stream_type_detect(struct input_stream *inStream) { diff --git a/src/decoder/_ogg_common.h b/src/decoder/_ogg_common.h index e650c366d..eca5d40e0 100644 --- a/src/decoder/_ogg_common.h +++ b/src/decoder/_ogg_common.h @@ -24,7 +24,7 @@ #ifndef MPD_OGG_COMMON_H #define MPD_OGG_COMMON_H -#include "../decoder_api.h" +#include "decoder_api.h" typedef enum _ogg_stream_type { VORBIS, FLAC } ogg_stream_type; diff --git a/src/decoder/audiofile_plugin.c b/src/decoder/audiofile_plugin.c index b4959f6c2..ca096c06e 100644 --- a/src/decoder/audiofile_plugin.c +++ b/src/decoder/audiofile_plugin.c @@ -17,7 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../decoder_api.h" +#include "config.h" +#include "decoder_api.h" #include <audiofile.h> #include <af_vfs.h> diff --git a/src/decoder/faad_plugin.c b/src/decoder/faad_plugin.c index 516f741c7..73a8a85b9 100644 --- a/src/decoder/faad_plugin.c +++ b/src/decoder/faad_plugin.c @@ -17,9 +17,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../decoder_api.h" -#include "decoder_buffer.h" #include "config.h" +#include "decoder_api.h" +#include "decoder_buffer.h" #define AAC_MAX_CHANNELS 6 diff --git a/src/decoder/ffmpeg_plugin.c b/src/decoder/ffmpeg_plugin.c index 63f0f7ece..41fc70908 100644 --- a/src/decoder/ffmpeg_plugin.c +++ b/src/decoder/ffmpeg_plugin.c @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../decoder_api.h" #include "config.h" +#include "decoder_api.h" #include <glib.h> diff --git a/src/decoder/flac_metadata.c b/src/decoder/flac_metadata.c index 912559c8d..1ff99f151 100644 --- a/src/decoder/flac_metadata.c +++ b/src/decoder/flac_metadata.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "flac_metadata.h" #include "replay_gain.h" #include "tag.h" diff --git a/src/decoder/flac_pcm.c b/src/decoder/flac_pcm.c index d37ef54e2..737d5b043 100644 --- a/src/decoder/flac_pcm.c +++ b/src/decoder/flac_pcm.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "flac_pcm.h" static void flac_convert_stereo16(int16_t *dest, diff --git a/src/decoder/fluidsynth_plugin.c b/src/decoder/fluidsynth_plugin.c index 99c874c09..3e8a4edc4 100644 --- a/src/decoder/fluidsynth_plugin.c +++ b/src/decoder/fluidsynth_plugin.c @@ -26,9 +26,10 @@ * */ -#include "../decoder_api.h" -#include "../timer.h" -#include "../conf.h" +#include "config.h" +#include "decoder_api.h" +#include "timer.h" +#include "conf.h" #include <glib.h> diff --git a/src/decoder/mad_plugin.c b/src/decoder/mad_plugin.c index 27ddf655d..d8231014f 100644 --- a/src/decoder/mad_plugin.c +++ b/src/decoder/mad_plugin.c @@ -17,9 +17,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../decoder_api.h" -#include "../conf.h" #include "config.h" +#include "decoder_api.h" +#include "conf.h" #include "tag_id3.h" #include <assert.h> diff --git a/src/decoder/mikmod_plugin.c b/src/decoder/mikmod_plugin.c index 850232f34..1d5be2970 100644 --- a/src/decoder/mikmod_plugin.c +++ b/src/decoder/mikmod_plugin.c @@ -17,7 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../decoder_api.h" +#include "config.h" +#include "decoder_api.h" #include <glib.h> #include <mikmod.h> diff --git a/src/decoder/modplug_plugin.c b/src/decoder/modplug_plugin.c index 301c80674..7781511b6 100644 --- a/src/decoder/modplug_plugin.c +++ b/src/decoder/modplug_plugin.c @@ -17,7 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../decoder_api.h" +#include "config.h" +#include "decoder_api.h" #include <glib.h> #include <modplug.h> diff --git a/src/decoder/mp4ff_plugin.c b/src/decoder/mp4ff_plugin.c index 745d1e619..2905438e2 100644 --- a/src/decoder/mp4ff_plugin.c +++ b/src/decoder/mp4ff_plugin.c @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../decoder_api.h" #include "config.h" +#include "decoder_api.h" #include <glib.h> diff --git a/src/decoder/mpcdec_plugin.c b/src/decoder/mpcdec_plugin.c index a684da104..b7c5af5f8 100644 --- a/src/decoder/mpcdec_plugin.c +++ b/src/decoder/mpcdec_plugin.c @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../decoder_api.h" #include "config.h" +#include "decoder_api.h" #ifdef MPC_IS_OLD_API #include <mpcdec/mpcdec.h> diff --git a/src/decoder/sidplay_plugin.cxx b/src/decoder/sidplay_plugin.cxx index 079b178fb..f88e5b582 100644 --- a/src/decoder/sidplay_plugin.cxx +++ b/src/decoder/sidplay_plugin.cxx @@ -17,6 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" + extern "C" { #include "../decoder_api.h" } diff --git a/src/decoder/sndfile_decoder_plugin.c b/src/decoder/sndfile_decoder_plugin.c index 59993ef89..c5ac651a3 100644 --- a/src/decoder/sndfile_decoder_plugin.c +++ b/src/decoder/sndfile_decoder_plugin.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "decoder_api.h" #include <sndfile.h> diff --git a/src/decoder/vorbis_plugin.c b/src/decoder/vorbis_plugin.c index 0f37956ae..71d38c3ba 100755 --- a/src/decoder/vorbis_plugin.c +++ b/src/decoder/vorbis_plugin.c @@ -17,11 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* TODO 'ogg' should probably be replaced with 'oggvorbis' in all instances */ - -#include "config.h" /* must be first for large file support */ -#include "_ogg_common.h" #include "config.h" +#include "_ogg_common.h" #include "uri.h" #ifndef HAVE_TREMOR diff --git a/src/decoder/wavpack_plugin.c b/src/decoder/wavpack_plugin.c index efffcaeb1..c784d51db 100644 --- a/src/decoder/wavpack_plugin.c +++ b/src/decoder/wavpack_plugin.c @@ -17,9 +17,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../decoder_api.h" -#include "../path.h" -#include "../utils.h" +#include "config.h" +#include "decoder_api.h" +#include "path.h" +#include "utils.h" #include <wavpack/wavpack.h> #include <glib.h> diff --git a/src/decoder/wildmidi_plugin.c b/src/decoder/wildmidi_plugin.c index 8bad6943a..718f24c2e 100644 --- a/src/decoder/wildmidi_plugin.c +++ b/src/decoder/wildmidi_plugin.c @@ -17,7 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "../decoder_api.h" +#include "config.h" +#include "decoder_api.h" #include <glib.h> diff --git a/src/decoder_api.c b/src/decoder_api.c index 2350396a9..c6c23182e 100644 --- a/src/decoder_api.c +++ b/src/decoder_api.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "decoder_api.h" #include "decoder_internal.h" #include "decoder_control.h" diff --git a/src/decoder_api.h b/src/decoder_api.h index 2ecd98ce7..81f75623a 100644 --- a/src/decoder_api.h +++ b/src/decoder_api.h @@ -27,6 +27,7 @@ #ifndef MPD_DECODER_API_H #define MPD_DECODER_API_H +#include "check.h" #include "decoder_command.h" #include "decoder_plugin.h" #include "input_stream.h" diff --git a/src/decoder_buffer.c b/src/decoder_buffer.c index b6fa90004..a313eacc5 100644 --- a/src/decoder_buffer.c +++ b/src/decoder_buffer.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "decoder_buffer.h" #include "decoder_api.h" diff --git a/src/decoder_control.c b/src/decoder_control.c index 7fe18088b..a26edd150 100644 --- a/src/decoder_control.c +++ b/src/decoder_control.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "decoder_control.h" #include "player_control.h" diff --git a/src/decoder_internal.c b/src/decoder_internal.c index d40ef89d7..60c43e679 100644 --- a/src/decoder_internal.c +++ b/src/decoder_internal.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "decoder_internal.h" #include "decoder_control.h" #include "player_control.h" diff --git a/src/decoder_list.c b/src/decoder_list.c index 2ee4f3ec9..c322bc433 100644 --- a/src/decoder_list.c +++ b/src/decoder_list.c @@ -17,10 +17,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "decoder_list.h" #include "decoder_plugin.h" #include "utils.h" -#include "config.h" #include "conf.h" #include <glib.h> diff --git a/src/decoder_plugin.c b/src/decoder_plugin.c index 79b0d5322..b5966ff8d 100644 --- a/src/decoder_plugin.c +++ b/src/decoder_plugin.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "decoder_plugin.h" #include "utils.h" diff --git a/src/decoder_print.c b/src/decoder_print.c index b2d394093..5dbb32803 100644 --- a/src/decoder_print.c +++ b/src/decoder_print.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "decoder_print.h" #include "decoder_list.h" #include "decoder_plugin.h" diff --git a/src/decoder_thread.c b/src/decoder_thread.c index 9c12ecb07..c055d2a32 100644 --- a/src/decoder_thread.c +++ b/src/decoder_thread.c @@ -17,6 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "config.h" #include "decoder_thread.h" #include "decoder_control.h" #include "decoder_internal.h" |