diff options
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 170 |
1 files changed, 137 insertions, 33 deletions
diff --git a/Makefile.am b/Makefile.am index 478614406..7cd4d1615 100644 --- a/Makefile.am +++ b/Makefile.am @@ -45,7 +45,6 @@ mpd_headers = \ src/audio_parser.h \ src/output_internal.h \ src/output_api.h \ - src/output_plugin.h \ src/output_list.h \ src/output_all.h \ src/output_thread.h \ @@ -78,7 +77,6 @@ mpd_headers = \ src/decoder_internal.h \ src/directory.h \ src/directory_save.h \ - src/directory_print.h \ src/database.h \ src/encoder_plugin.h \ src/encoder_list.h \ @@ -101,6 +99,7 @@ mpd_headers = \ src/decoder/flac_pcm.h \ src/decoder/_flac_common.h \ src/decoder/_ogg_common.h \ + src/decoder/pcm_decoder_plugin.h \ src/input_init.h \ src/input_plugin.h \ src/input_registry.h \ @@ -110,6 +109,9 @@ mpd_headers = \ src/input/curl_input_plugin.h \ src/input/rewind_input_plugin.h \ src/input/mms_input_plugin.h \ + src/input/despotify_input_plugin.h \ + src/input/cdio_paranoia_input_plugin.h \ + src/despotify_utils.h \ src/text_file.h \ src/text_input_stream.h \ src/icy_server.h \ @@ -141,8 +143,6 @@ mpd_headers = \ src/open.h \ src/output/httpd_client.h \ src/output/httpd_internal.h \ - src/output/pulse_output_plugin.h \ - src/output/winmm_output_plugin.h \ src/page.h \ src/pcm_buffer.h \ src/pcm_utils.h \ @@ -161,6 +161,7 @@ mpd_headers = \ src/player_thread.h \ src/player_control.h \ src/playlist.h \ + src/playlist_error.h \ src/playlist_internal.h \ src/playlist_print.h \ src/playlist_save.h \ @@ -180,6 +181,7 @@ mpd_headers = \ src/playlist/asx_playlist_plugin.h \ src/playlist/rss_playlist_plugin.h \ src/playlist/lastfm_playlist_plugin.h \ + src/playlist/despotify_playlist_plugin.h \ src/playlist/cue_playlist_plugin.h \ src/playlist/flac_playlist_plugin.h \ src/poison.h \ @@ -216,6 +218,7 @@ mpd_headers = \ src/strset.h \ src/uri.h \ src/utils.h \ + src/string_util.h \ src/volume.h \ src/zeroconf.h src/zeroconf-internal.h \ src/locate.h \ @@ -262,8 +265,14 @@ src_mpd_SOURCES = \ src/decoder_print.c \ src/directory.c \ src/directory_save.c \ - src/directory_print.c \ src/database.c \ + src/db_error.h \ + src/db_save.c src/db_save.h \ + src/db_print.c src/db_print.h \ + src/db_plugin.h \ + src/db_visitor.h \ + src/db_selection.h \ + src/db/simple_db_plugin.c src/db/simple_db_plugin.h \ src/dirvec.c \ src/exclude.c \ src/fd_util.c \ @@ -279,16 +288,24 @@ src_mpd_SOURCES = \ src/client_event.c \ src/client_expire.c \ src/client_global.c \ + src/client_idle.h \ src/client_idle.c \ src/client_list.c \ src/client_new.c \ src/client_process.c \ src/client_read.c \ src/client_write.c \ + src/client_message.h \ + src/client_message.c \ + src/client_subscribe.h \ + src/client_subscribe.c \ + src/tcp_socket.c src/tcp_socket.h \ + src/udp_server.c src/udp_server.h \ src/server_socket.c \ src/listen.c \ src/log.c \ src/ls.c \ + src/io_thread.c src/io_thread.h \ src/main.c \ src/main_win32.c \ src/event_pipe.c \ @@ -350,11 +367,17 @@ src_mpd_SOURCES = \ src/strset.c \ src/uri.c \ src/utils.c \ + src/string_util.c \ src/volume.c \ src/locate.c \ src/stored_playlist.c \ src/timer.c +if ENABLE_DESPOTIFY +src_mpd_SOURCES += \ + src/despotify_utils.c +endif + if ENABLE_INOTIFY src_mpd_SOURCES += \ src/inotify_source.c \ @@ -464,6 +487,7 @@ DECODER_LIBS = \ $(CUE_LIBS) DECODER_SRC = \ + src/decoder/pcm_decoder_plugin.c \ src/decoder_buffer.c \ src/decoder_plugin.c \ src/decoder_list.c @@ -511,10 +535,6 @@ if HAVE_FLAC DECODER_SRC += src/decoder/flac_decoder_plugin.c endif -if HAVE_OGGFLAC -DECODER_SRC += src/decoder/oggflac_decoder_plugin.c -endif - if HAVE_AUDIOFILE DECODER_SRC += src/decoder/audiofile_decoder_plugin.c endif @@ -619,11 +639,15 @@ endif INPUT_CFLAGS = \ $(CURL_CFLAGS) \ + $(SOUP_CFLAGS) \ + $(CDIO_PARANOIA_CFLAGS) \ $(FFMPEG_CFLAGS) \ $(MMS_CFLAGS) INPUT_LIBS = \ $(CURL_LIBS) \ + $(SOUP_LIBS) \ + $(CDIO_PARANOIA_LIBS) \ $(FFMPEG_LIBS) \ $(MMS_LIBS) @@ -631,6 +655,7 @@ INPUT_SRC = \ src/input_init.c \ src/input_registry.c \ src/input_stream.c \ + src/input_internal.c src/input_internal.h \ src/input/rewind_input_plugin.c \ src/input/file_input_plugin.c @@ -639,6 +664,16 @@ INPUT_SRC += src/input/curl_input_plugin.c \ src/icy_metadata.c endif +if ENABLE_SOUP +INPUT_SRC += \ + src/input/soup_input_plugin.c \ + src/input/soup_input_plugin.h +endif + +if ENABLE_CDIO_PARANOIA +INPUT_SRC += src/input/cdio_paranoia_input_plugin.c +endif + if HAVE_FFMPEG INPUT_SRC += src/input/ffmpeg_input_plugin.c endif @@ -647,6 +682,10 @@ if ENABLE_MMS INPUT_SRC += src/input/mms_input_plugin.c endif +if ENABLE_DESPOTIFY +INPUT_SRC += src/input/despotify_input_plugin.c +endif + OUTPUT_CFLAGS = \ $(AO_CFLAGS) \ @@ -654,6 +693,7 @@ OUTPUT_CFLAGS = \ $(FFADO_CFLAGS) \ $(JACK_CFLAGS) \ $(OPENAL_CFLAGS) \ + $(OPENSSL_CFLAGS) \ $(PULSE_CFLAGS) \ $(SHOUT_CFLAGS) @@ -661,6 +701,7 @@ OUTPUT_LIBS = \ $(LIBWRAP_LDFLAGS) \ $(AO_LIBS) \ $(ALSA_LIBS) \ + $(ROAR_LIBS) \ $(FFADO_LIBS) \ $(JACK_LIBS) \ $(OPENAL_LIBS) \ @@ -675,10 +716,12 @@ OUTPUT_API_SRC = \ src/output_state.c \ src/output_print.c \ src/output_command.c \ + src/output_plugin.c src/output_plugin.h \ + src/output_finish.c \ src/output_init.c OUTPUT_SRC = \ - src/output/null_plugin.c + src/output/null_output_plugin.c MIXER_API_SRC = \ src/mixer_control.c \ @@ -690,16 +733,23 @@ MIXER_SRC = \ src/mixer/software_mixer_plugin.c if HAVE_ALSA -OUTPUT_SRC += src/output/alsa_plugin.c +OUTPUT_SRC += \ + src/output/alsa_output_plugin.c src/output/alsa_output_plugin.h MIXER_SRC += src/mixer/alsa_mixer_plugin.c endif +if HAVE_ROAR +OUTPUT_SRC += \ + src/output/roar_output_plugin.c src/output/roar_output_plugin.h +MIXER_SRC += src/mixer/roar_mixer_plugin.c +endif + if ENABLE_FFADO_OUTPUT OUTPUT_SRC += src/output/ffado_output_plugin.c endif if HAVE_AO -OUTPUT_SRC += src/output/ao_plugin.c +OUTPUT_SRC += src/output/ao_output_plugin.c endif if HAVE_FIFO @@ -715,29 +765,39 @@ OUTPUT_SRC += src/output/jack_output_plugin.c endif if HAVE_MVP -OUTPUT_SRC += src/output/mvp_plugin.c +OUTPUT_SRC += src/output/mvp_output_plugin.c endif if HAVE_OSS -OUTPUT_SRC += src/output/oss_plugin.c +OUTPUT_SRC += src/output/oss_output_plugin.c MIXER_SRC += src/mixer/oss_mixer_plugin.c endif if HAVE_OPENAL -OUTPUT_SRC += src/output/openal_plugin.c +OUTPUT_SRC += src/output/openal_output_plugin.c endif if HAVE_OSX -OUTPUT_SRC += src/output/osx_plugin.c +OUTPUT_SRC += src/output/osx_output_plugin.c +endif + +if ENABLE_RAOP_OUTPUT +OUTPUT_SRC += \ + src/ntp_server.c src/ntp_server.h \ + src/rtsp_client.c src/rtsp_client.h \ + src/output/raop_output_plugin.c +MIXER_SRC += src/mixer/raop_mixer_plugin.c +OUTPUT_LIBS += $(OPENSSL_LIBS) endif if HAVE_PULSE -OUTPUT_SRC += src/output/pulse_output_plugin.c +OUTPUT_SRC += \ + src/output/pulse_output_plugin.c src/output/pulse_output_plugin.h MIXER_SRC += src/mixer/pulse_mixer_plugin.c endif if HAVE_SHOUT -OUTPUT_SRC += src/output/shout_plugin.c +OUTPUT_SRC += src/output/shout_output_plugin.c endif if ENABLE_RECORDER_OUTPUT @@ -756,7 +816,8 @@ OUTPUT_SRC += src/output/solaris_output_plugin.c endif if ENABLE_WINMM_OUTPUT -OUTPUT_SRC += src/output/winmm_output_plugin.c +OUTPUT_SRC += \ + src/output/winmm_output_plugin.c src/output/winmm_output_plugin.h MIXER_SRC += src/mixer/winmm_mixer_plugin.c endif @@ -778,6 +839,10 @@ if ENABLE_LASTFM PLAYLIST_SRC += src/playlist/lastfm_playlist_plugin.c endif +if ENABLE_DESPOTIFY +PLAYLIST_SRC += src/playlist/despotify_playlist_plugin.c +endif + if HAVE_CUE PLAYLIST_SRC += src/playlist/cue_playlist_plugin.c endif @@ -816,8 +881,9 @@ SPARSE_CPPFLAGS = $(DEFAULT_INCLUDES) \ -I$(shell $(CC) -print-file-name=include-fixed) SPARSE_CPPFLAGS += -D__SCHAR_MAX__=127 -D__SHRT_MAX__=32767 \ -D__INT_MAX__=2147483647 -D__LONG_MAX__=2147483647 +SPARSE_SRC = $(addprefix $(top_srcdir)/,$(filter %.c,$(src_mpd_SOURCES))) sparse-check: - $(SPARSE) -I. $(src_mpd_CFLAGS) $(src_mpd_CPPFLAGS) $(SPARSE_FLAGS) $(SPARSE_CPPFLAGS) $(filter-out %.cxx,$(src_mpd_SOURCES)) + $(SPARSE) -I. $(src_mpd_CFLAGS) $(src_mpd_CPPFLAGS) $(SPARSE_FLAGS) $(SPARSE_CPPFLAGS) $(SPARSE_SRC) .PHONY: sparse-check @@ -828,14 +894,19 @@ sparse-check: if ENABLE_TEST -TESTS = +C_TESTS = \ + test/test_queue_priority + +TESTS = $(C_TESTS) noinst_PROGRAMS = \ + $(C_TESTS) \ test/read_conf \ test/run_input \ test/dump_playlist \ test/run_decoder \ test/read_tags \ + test/run_ntp_server \ test/run_filter \ test/run_output \ test/run_convert \ @@ -852,7 +923,7 @@ test_read_conf_CPPFLAGS = $(AM_CPPFLAGS) \ test_read_conf_LDADD = $(MPD_LIBS) \ $(GLIB_LIBS) test_read_conf_SOURCES = test/read_conf.c \ - src/conf.c src/tokenizer.c src/utils.c + src/conf.c src/tokenizer.c src/utils.c src/string_util.c test_run_input_CPPFLAGS = $(AM_CPPFLAGS) \ $(ARCHIVE_CFLAGS) \ @@ -863,7 +934,8 @@ test_run_input_LDADD = $(MPD_LIBS) \ $(GLIB_LIBS) test_run_input_SOURCES = test/run_input.c \ test/stdbin.h \ - src/conf.c src/tokenizer.c src/utils.c \ + src/io_thread.c src/io_thread.h \ + src/conf.c src/tokenizer.c src/utils.c src/string_util.c\ src/tag.c src/tag_pool.c src/tag_save.c \ src/fd_util.c \ $(ARCHIVE_SRC) \ @@ -881,7 +953,8 @@ test_dump_playlist_LDADD = $(MPD_LIBS) \ $(INPUT_LIBS) \ $(GLIB_LIBS) test_dump_playlist_SOURCES = test/dump_playlist.c \ - src/conf.c src/tokenizer.c src/utils.c \ + src/io_thread.c src/io_thread.h \ + src/conf.c src/tokenizer.c src/utils.c src/string_util.c\ src/uri.c \ src/song.c src/tag.c src/tag_pool.c src/tag_save.c \ src/text_input_stream.c src/fifo_buffer.c \ @@ -911,7 +984,8 @@ test_run_decoder_LDADD = $(MPD_LIBS) \ $(GLIB_LIBS) test_run_decoder_SOURCES = test/run_decoder.c \ test/stdbin.h \ - src/conf.c src/tokenizer.c src/utils.c src/log.c \ + src/io_thread.c src/io_thread.h \ + src/conf.c src/tokenizer.c src/utils.c src/string_util.c src/log.c \ src/tag.c src/tag_pool.c \ src/replay_gain_info.c \ src/uri.c \ @@ -934,7 +1008,8 @@ test_read_tags_LDADD = $(MPD_LIBS) \ $(INPUT_LIBS) $(DECODER_LIBS) \ $(GLIB_LIBS) test_read_tags_SOURCES = test/read_tags.c \ - src/conf.c src/tokenizer.c src/utils.c src/log.c \ + src/io_thread.c src/io_thread.h \ + src/conf.c src/tokenizer.c src/utils.c src/string_util.c src/log.c \ src/tag.c src/tag_pool.c \ src/replay_gain_info.c \ src/uri.c \ @@ -946,6 +1021,15 @@ test_read_tags_SOURCES = test/read_tags.c \ $(TAG_SRC) \ $(DECODER_SRC) +test_run_ntp_server_CPPFLAGS = $(AM_CPPFLAGS) +test_run_ntp_server_LDADD = $(MPD_LIBS) \ + $(GLIB_LIBS) +test_run_ntp_server_SOURCES = test/run_ntp_server.c \ + test/signals.c test/signals.h \ + src/io_thread.c src/io_thread.h \ + src/udp_server.c src/udp_server.h \ + src/ntp_server.c src/ntp_server.h + test_run_filter_CPPFLAGS = $(AM_CPPFLAGS) test_run_filter_LDADD = $(MPD_LIBS) \ $(SAMPLERATE_LIBS) \ @@ -954,7 +1038,7 @@ test_run_filter_SOURCES = test/run_filter.c \ test/stdbin.h \ src/filter_plugin.c \ src/filter_registry.c \ - src/conf.c src/tokenizer.c src/utils.c \ + src/conf.c src/tokenizer.c src/utils.c src/string_util.c \ src/pcm_volume.c src/pcm_convert.c src/pcm_byteswap.c \ src/pcm_format.c src/pcm_channels.c src/pcm_dither.c \ src/pcm_pack.c \ @@ -971,12 +1055,23 @@ if HAVE_LIBSAMPLERATE test_run_filter_SOURCES += src/pcm_resample_libsamplerate.c endif +if ENABLE_DESPOTIFY +test_read_tags_SOURCES += \ + src/despotify_utils.c +test_run_input_SOURCES += \ + src/despotify_utils.c +test_dump_playlist_SOURCES += \ + src/despotify_utils.c +test_run_decoder_SOURCES += \ + src/despotify_utils.c +endif + if ENABLE_ENCODER noinst_PROGRAMS += test/run_encoder test_run_encoder_SOURCES = test/run_encoder.c \ test/stdbin.h \ src/conf.c src/tokenizer.c \ - src/utils.c \ + src/utils.c src/string_util.c \ src/tag.c src/tag_pool.c \ src/audio_check.c \ src/audio_format.c \ @@ -1037,7 +1132,10 @@ test_run_output_LDADD = $(MPD_LIBS) \ $(GLIB_LIBS) test_run_output_SOURCES = test/run_output.c \ test/stdbin.h \ - src/conf.c src/tokenizer.c src/utils.c src/log.c \ + src/conf.c src/tokenizer.c src/utils.c src/string_util.c src/log.c \ + src/io_thread.c src/io_thread.h \ + src/udp_server.c src/udp_server.h \ + src/tcp_socket.c src/tcp_socket.h \ src/audio_check.c \ src/audio_format.c \ src/audio_parser.c \ @@ -1046,7 +1144,8 @@ test_run_output_SOURCES = test/run_output.c \ src/fifo_buffer.c \ src/page.c \ src/socket_util.c \ - src/output_init.c src/output_list.c \ + src/output_init.c src/output_finish.c src/output_list.c \ + src/output_plugin.c \ $(ENCODER_SRC) \ src/mixer_api.c \ src/mixer_control.c \ @@ -1073,7 +1172,7 @@ test_read_mixer_LDADD = $(MPD_LIBS) \ $(OUTPUT_LIBS) \ $(GLIB_LIBS) test_read_mixer_SOURCES = test/read_mixer.c \ - src/conf.c src/tokenizer.c src/utils.c src/log.c \ + src/conf.c src/tokenizer.c src/utils.c src/string_util.c src/log.c \ src/mixer_control.c src/mixer_api.c \ src/filter_plugin.c \ src/filter/volume_filter_plugin.c \ @@ -1101,6 +1200,12 @@ test_run_inotify_SOURCES = test/run_inotify.c \ test_run_inotify_LDADD = $(GLIB_LIBS) endif +test_test_queue_priority_SOURCES = \ + src/queue.c \ + test/test_queue_priority.c +test_test_queue_priority_LDADD = \ + $(GLIB_LIBS) + endif @@ -1138,8 +1243,7 @@ endif doc/api/html/index.html: doc/doxygen.conf @mkdir -p $(@D) - [ "$(srcdir)" = "." ] || sed '/INPUT *=/ s/\([^ ]\+\/\)/$(subst /,\/,$(srcdir))\/\1/g' $(srcdir)/doc/doxygen.conf >doc/doxygen.conf - $(DOXYGEN) doc/doxygen.conf + $(DOXYGEN) $< all-local: $(DOCBOOK_HTML) doc/api/html/index.html |