diff options
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 443 |
1 files changed, 235 insertions, 208 deletions
diff --git a/Makefile.am b/Makefile.am index 89b643530..d4761c950 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,6 +12,7 @@ noinst_LIBRARIES = \ libpcm.a \ libtag.a \ libinput.a \ + libdb_plugins.a \ libplaylist_plugins.a \ libdecoder_plugins.a \ libfilter_plugins.a \ @@ -19,10 +20,12 @@ noinst_LIBRARIES = \ liboutput_plugins.a src_mpd_CPPFLAGS = $(AM_CPPFLAGS) \ + $(LIBMPDCLIENT_CFLAGS) \ $(AVAHI_CFLAGS) \ $(LIBWRAP_CFLAGS) \ $(SQLITE_CFLAGS) src_mpd_LDADD = \ + $(DB_LIBS) \ $(PLAYLIST_LIBS) \ $(AVAHI_LIBS) \ $(LIBWRAP_LDFLAGS) \ @@ -49,13 +52,7 @@ mpd_headers = \ src/audio_parser.h \ src/output_internal.h \ src/output_api.h \ - src/output_list.h \ src/output_all.h \ - src/output_thread.h \ - src/output_control.h \ - src/output_state.h \ - src/output_print.h \ - src/output_command.h \ src/filter_internal.h \ src/filter_config.h \ src/filter_plugin.h \ @@ -67,39 +64,20 @@ mpd_headers = \ src/filter/volume_filter_plugin.h \ src/command.h \ src/idle.h \ - src/cmdline.h \ src/conf.h \ - src/crossfade.h \ - src/dbUtils.h \ - src/decoder_thread.h \ - src/decoder_control.h \ src/decoder_plugin.h \ src/decoder_command.h \ src/decoder_buffer.h \ src/decoder_api.h \ src/decoder_plugin.h \ - src/decoder_internal.h \ - src/directory.h \ - src/directory_save.h \ - src/database.h \ src/encoder_plugin.h \ src/encoder_list.h \ src/encoder_api.h \ - src/exclude.h \ src/fd_util.h \ + src/gerror.h \ src/glib_compat.h \ - src/update.h \ - src/inotify_source.h \ - src/inotify_queue.h \ - src/inotify_update.h \ src/gcc.h \ src/decoder_list.h \ - src/decoder_print.h \ - src/decoder/flac_compat.h \ - src/decoder/flac_metadata.h \ - 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 \ @@ -113,17 +91,12 @@ mpd_headers = \ 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 \ src/icy_metadata.h \ - src/client.h \ - src/client_internal.h \ src/server_socket.h \ - src/listen.h \ src/log.h \ src/ls.h \ - src/main.h \ src/mixer_all.h \ src/mixer_api.h \ src/mixer_control.h \ @@ -136,32 +109,16 @@ mpd_headers = \ src/daemon.h \ src/AudioCompress/config.h \ src/AudioCompress/compress.h \ - src/buffer.h \ - src/pipe.h \ - src/chunk.h \ src/path.h \ - src/mapper.h \ src/open.h \ src/output/httpd_client.h \ src/output/httpd_internal.h \ src/page.h \ - src/permission.h \ - src/player_thread.h \ - src/player_control.h \ - src/playlist.h \ + src/Playlist.hxx \ src/playlist_error.h \ - src/playlist_internal.h \ - src/playlist_print.h \ - src/playlist_save.h \ - src/playlist_state.h \ + src/PlaylistInternal.hxx \ src/playlist_plugin.h \ src/playlist_list.h \ - src/playlist_mapper.h \ - src/playlist_any.h \ - src/playlist_song.h \ - src/playlist_queue.h \ - src/playlist_vector.h \ - src/playlist_database.h \ src/playlist/extm3u_playlist_plugin.h \ src/playlist/m3u_playlist_plugin.h \ src/playlist/pls_playlist_plugin.h \ @@ -174,24 +131,16 @@ mpd_headers = \ src/poison.h \ src/riff.h \ src/aiff.h \ - src/queue.h \ - src/queue_print.h \ - src/queue_save.h \ src/refcount.h \ src/replay_gain_config.h \ src/replay_gain_info.h \ src/replay_gain_ape.h \ src/sig_handlers.h \ + src/TimePrint.cxx src/TimePrint.hxx \ src/song.h \ - src/song_print.h \ - src/song_save.h \ - src/song_sticker.h \ src/song_sort.c src/song_sort.h \ src/socket_util.h \ - src/state_file.h \ src/stats.h \ - src/sticker.h \ - src/sticker_print.h \ src/tag.h \ src/tag_internal.h \ src/tag_pool.h \ @@ -199,17 +148,12 @@ mpd_headers = \ src/tag_ape.h \ src/tag_id3.h \ src/tag_rva2.h \ - src/tag_print.h \ - src/tag_save.h \ src/tokenizer.h \ - 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 \ - src/stored_playlist.h \ src/timer.h \ src/archive_api.h \ src/archive_internal.h \ @@ -226,6 +170,8 @@ src_mpd_SOURCES = \ $(DECODER_SRC) \ $(OUTPUT_API_SRC) \ $(MIXER_API_SRC) \ + src/thread/Mutex.hxx \ + src/thread/CriticalSection.hxx \ src/glib_socket.h \ src/clock.c src/clock.h \ src/notify.c \ @@ -233,126 +179,136 @@ src_mpd_SOURCES = \ src/audio_check.c \ src/audio_format.c \ src/audio_parser.c \ - src/protocol/argparser.c src/protocol/argparser.h \ - src/protocol/result.c src/protocol/result.h \ - src/command.c \ + src/protocol/ArgParser.cxx src/protocol/ArgParser.hxx \ + src/protocol/Result.cxx src/protocol/Result.hxx \ + src/CommandError.cxx src/CommandError.hxx \ + src/AllCommands.cxx src/AllCommands.hxx \ + src/QueueCommands.cxx src/QueueCommands.hxx \ + src/PlayerCommands.cxx src/PlayerCommands.hxx \ + src/PlaylistCommands.cxx src/PlaylistCommands.hxx \ + src/DatabaseCommands.cxx src/DatabaseCommands.hxx \ + src/OutputCommands.cxx src/OutputCommands.hxx \ + src/MessageCommands.cxx src/MessageCommands.hxx \ + src/OtherCommands.cxx src/OtherCommands.hxx \ src/idle.c \ - src/cmdline.c \ + src/CommandLine.cxx src/CommandLine.hxx \ src/conf.c \ - src/crossfade.c \ + src/CrossFade.cxx src/CrossFade.hxx \ src/cue/cue_parser.c src/cue/cue_parser.h \ - src/dbUtils.c \ - src/decoder_thread.c \ - src/decoder_control.c \ - src/decoder_api.c \ - src/decoder_internal.c \ - src/decoder_print.c \ - src/directory.c \ - src/directory_save.c \ - src/database.c \ - src/db_internal.h \ + src/decoder_error.h \ + src/DecoderThread.cxx src/DecoderThread.hxx \ + src/DecoderControl.cxx src/DecoderControl.hxx \ + src/DecoderAPI.cxx \ + src/DecoderInternal.cxx src/DecoderInternal.hxx \ + src/DecoderPrint.cxx src/DecoderPrint.hxx \ + src/Directory.cxx src/Directory.hxx \ + src/DirectorySave.cxx src/DirectorySave.hxx \ + src/DatabaseSimple.hxx \ + src/DatabaseGlue.cxx src/DatabaseGlue.hxx \ + src/DatabasePrint.cxx src/DatabasePrint.hxx \ + src/DatabaseQueue.cxx src/DatabaseQueue.hxx \ + src/DatabasePlaylist.cxx src/DatabasePlaylist.hxx \ src/db_error.h \ - src/db_lock.c src/db_lock.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/exclude.c \ + src/DatabaseLock.cxx src/DatabaseLock.hxx \ + src/DatabaseSave.cxx src/DatabaseSave.hxx \ + src/DatabasePlugin.hxx \ + src/DatabaseVisitor.hxx \ + src/DatabaseSelection.cxx src/DatabaseSelection.hxx \ + src/ExcludeList.cxx src/ExcludeList.hxx \ src/fd_util.c \ src/fifo_buffer.c src/fifo_buffer.h \ src/growing_fifo.c src/growing_fifo.h \ src/filter_config.c \ src/filter_plugin.c \ src/filter_registry.c \ - src/update.c \ - src/update_queue.c src/update_queue.h \ - src/update_io.c src/update_io.h \ - src/update_db.c src/update_db.h \ - src/update_walk.c src/update_walk.h \ - src/update_song.c src/update_song.h \ - src/update_container.c src/update_container.h \ - src/update_internal.h \ - src/update_remove.c src/update_remove.h \ - src/client.c \ - 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/client_file.c src/client_file.h \ + src/UpdateGlue.cxx src/UpdateGlue.hxx \ + src/UpdateQueue.cxx src/UpdateQueue.hxx \ + src/UpdateIO.cxx src/UpdateIO.hxx \ + src/UpdateDatabase.cxx src/UpdateDatabase.hxx \ + src/UpdateWalk.cxx src/UpdateWalk.hxx \ + src/UpdateSong.cxx src/UpdateSong.hxx \ + src/UpdateContainer.cxx src/UpdateContainer.hxx \ + src/UpdateInternal.hxx \ + src/UpdateRemove.cxx src/UpdateRemove.hxx \ + src/CommandListBuilder.cxx src/CommandListBuilder.hxx \ + src/Client.cxx src/Client.hxx \ + src/ClientInternal.hxx \ + src/ClientEvent.cxx \ + src/ClientExpire.cxx \ + src/ClientGlobal.cxx \ + src/ClientIdle.cxx src/ClientIdle.hxx \ + src/ClientList.cxx \ + src/ClientNew.cxx \ + src/ClientProcess.cxx \ + src/ClientRead.cxx \ + src/ClientWrite.cxx \ + src/ClientMessage.cxx src/ClientMessage.hxx \ + src/ClientSubscribe.cxx src/ClientSubscribe.hxx \ + src/ClientFile.cxx src/ClientFile.hxx \ src/server_socket.c \ - src/listen.c \ + src/Listen.cxx src/Listen.hxx \ src/log.c \ - src/ls.c \ + src/ls.cxx \ + src/io_error.h \ src/io_thread.c src/io_thread.h \ - src/main.c \ - src/main_win32.c \ + src/Main.cxx src/Main.hxx \ + src/Win32Main.cxx \ src/event_pipe.c \ src/daemon.c \ src/AudioCompress/compress.c \ - src/buffer.c \ - src/pipe.c \ - src/chunk.c \ + src/MusicBuffer.cxx src/MusicBuffer.hxx \ + src/MusicPipe.cxx src/MusicPipe.hxx \ + src/MusicChunk.cxx src/MusicChunk.hxx \ src/path.c \ - src/mapper.c \ + src/Mapper.cxx src/Mapper.hxx \ src/page.c \ - src/permission.c \ - src/player_thread.c \ - src/player_control.c \ - src/playlist.c \ - src/playlist_global.c \ - src/playlist_control.c \ - src/playlist_edit.c \ - src/playlist_print.c \ - src/playlist_save.c \ - src/playlist_mapper.c \ - src/playlist_any.c \ - src/playlist_song.c \ - src/playlist_state.c \ - src/playlist_queue.c \ - src/playlist_vector.c \ - src/playlist_database.c \ - src/queue.c \ - src/queue_print.c \ - src/queue_save.c \ - src/replay_gain_config.c \ - src/replay_gain_info.c \ + src/Partition.hxx \ + src/Permission.cxx src/Permission.hxx \ + src/PlayerThread.cxx src/PlayerThread.hxx \ + src/PlayerControl.cxx src/PlayerControl.hxx \ + src/Playlist.cxx \ + src/PlaylistGlobal.cxx \ + src/PlaylistControl.cxx \ + src/PlaylistEdit.cxx \ + src/PlaylistPrint.cxx src/PlaylistPrint.hxx \ + src/PlaylistSave.cxx src/PlaylistSave.hxx \ + src/PlaylistMapper.cxx src/PlaylistMapper.hxx \ + src/PlaylistAny.cxx src/PlaylistAny.hxx \ + src/PlaylistSong.cxx src/PlaylistSong.hxx \ + src/PlaylistState.cxx src/PlaylistState.hxx \ + src/PlaylistQueue.cxx src/PlaylistQueue.hxx \ + src/PlaylistVector.cxx src/PlaylistVector.hxx \ + src/PlaylistInfo.hxx \ + src/PlaylistDatabase.cxx \ + src/Queue.cxx src/Queue.hxx \ + src/QueuePrint.cxx src/QueuePrint.hxx \ + src/QueueSave.cxx src/QueueSave.hxx \ + src/ReplayGainConfig.cxx \ + src/ReplayGainInfo.cxx \ src/sig_handlers.c \ - src/song.c \ - src/song_update.c \ - src/song_print.c \ - src/song_save.c \ + src/Song.cxx \ + src/SongUpdate.cxx \ + src/SongPrint.cxx src/SongPrint.hxx \ + src/SongSave.cxx src/SongSave.hxx \ src/resolver.c src/resolver.h \ src/socket_util.c \ - src/state_file.c \ - src/stats.c \ + src/StateFile.cxx src/StateFile.hxx \ + src/Stats.cxx \ src/tag.c \ src/tag_pool.c \ - src/tag_print.c \ - src/tag_save.c \ + src/TagPrint.cxx src/TagPrint.hxx \ + src/TagSave.cxx src/TagSave.hxx \ src/tag_handler.c src/tag_handler.h \ src/tag_file.c src/tag_file.h \ src/tokenizer.c \ - src/text_file.c \ + src/TextFile.cxx src/TextFile.hxx \ src/text_input_stream.c \ - src/strset.c \ src/uri.c \ src/utils.c \ src/string_util.c \ src/volume.c \ - src/locate.c \ - src/stored_playlist.c \ + src/SongFilter.cxx src/SongFilter.hxx \ + src/PlaylistFile.cxx src/PlaylistFile.hxx \ src/timer.c # @@ -376,21 +332,24 @@ endif if ENABLE_INOTIFY src_mpd_SOURCES += \ - src/inotify_source.c \ - src/inotify_queue.c \ - src/inotify_update.c + src/InotifySource.cxx src/InotifySource.hxx \ + src/InotifyQueue.cxx src/InotifyQueue.hxx \ + src/InotifyUpdate.cxx src/InotifyUpdate.hxx endif if ENABLE_SQLITE src_mpd_SOURCES += \ - src/sticker.c \ - src/sticker_print.c \ - src/song_sticker.c + src/StickerCommands.cxx src/StickerCommands.hxx \ + src/StickerDatabase.cxx src/StickerDatabase.hxx \ + src/StickerPrint.cxx src/StickerPrint.hxx \ + src/SongSticker.cxx src/SongSticker.hxx endif # Generic utility library libutil_a_SOURCES = \ + src/util/SliceBuffer.hxx \ + src/util/HugeAllocator.cxx src/util/HugeAllocator.hxx \ src/util/list.h \ src/util/list_sort.c src/util/list_sort.h \ src/util/byte_reverse.c src/util/byte_reverse.h \ @@ -427,6 +386,22 @@ if HAVE_LIBSAMPLERATE libpcm_a_SOURCES += src/pcm_resample_libsamplerate.c endif +# database plugins + +libdb_plugins_a_SOURCES = \ + src/DatabaseRegistry.cxx src/DatabaseRegistry.hxx \ + src/DatabaseHelpers.cxx src/DatabaseHelpers.hxx \ + src/db/SimpleDatabasePlugin.cxx src/db/SimpleDatabasePlugin.hxx + +if HAVE_LIBMPDCLIENT +libdb_plugins_a_SOURCES += \ + src/db/ProxyDatabasePlugin.cxx src/db/ProxyDatabasePlugin.hxx +endif + +DB_LIBS = \ + libdb_plugins.a \ + $(LIBMPDCLIENT_LIBS) + # archive plugins if ENABLE_ARCHIVE @@ -434,7 +409,7 @@ if ENABLE_ARCHIVE noinst_LIBRARIES += libarchive.a src_mpd_SOURCES += \ - src/update_archive.c src/update_archive.h + src/UpdateArchive.cxx src/UpdateArchive.hxx libarchive_a_SOURCES = \ src/archive_api.c \ @@ -515,8 +490,10 @@ libdecoder_plugins_a_CPPFLAGS = $(AM_CPPFLAGS) \ $(WAVPACK_CFLAGS) \ $(MAD_CFLAGS) \ $(MPG123_CFLAGS) \ + $(OPUS_CFLAGS) \ $(FFMPEG_CFLAGS) \ $(MPCDEC_CFLAGS) \ + $(ADPLUG_CFLAGS) \ $(FAAD_CFLAGS) DECODER_LIBS = \ @@ -532,9 +509,11 @@ DECODER_LIBS = \ $(WAVPACK_LIBS) \ $(MAD_LIBS) \ $(MPG123_LIBS) \ + $(OPUS_LIBS) \ $(MP4FF_LIBS) \ $(FFMPEG_LIBS) \ $(MPCDEC_LIBS) \ + $(ADPLUG_LIBS) \ $(FAAD_LIBS) DECODER_SRC = @@ -551,10 +530,29 @@ if HAVE_MPCDEC libdecoder_plugins_a_SOURCES += src/decoder/mpcdec_decoder_plugin.c endif +if HAVE_OPUS +libdecoder_plugins_a_SOURCES += \ + src/decoder/OggUtil.cxx \ + src/decoder/OggUtil.hxx \ + src/decoder/OpusReader.hxx \ + src/decoder/OpusHead.hxx \ + src/decoder/OpusHead.cxx \ + src/decoder/OpusTags.cxx \ + src/decoder/OpusTags.hxx \ + src/decoder/OpusDecoderPlugin.cxx \ + src/decoder/OpusDecoderPlugin.h +endif + if HAVE_WAVPACK libdecoder_plugins_a_SOURCES += src/decoder/wavpack_decoder_plugin.c endif +if HAVE_ADPLUG +libdecoder_plugins_a_SOURCES += \ + src/decoder/AdPlugDecoderPlugin.cxx \ + src/decoder/AdPlugDecoderPlugin.h +endif + if HAVE_FAAD libdecoder_plugins_a_SOURCES += src/decoder/faad_decoder_plugin.c endif @@ -563,15 +561,10 @@ if HAVE_MP4 libdecoder_plugins_a_SOURCES += src/decoder/mp4ff_decoder_plugin.c endif -if HAVE_OGG_COMMON -libdecoder_plugins_a_SOURCES += src/decoder/_ogg_common.c -endif - -if HAVE_FLAC_COMMON +if HAVE_XIPH libdecoder_plugins_a_SOURCES += \ - src/decoder/flac_metadata.c \ - src/decoder/flac_pcm.c \ - src/decoder/_flac_common.c + src/decoder/XiphTags.c src/decoder/XiphTags.h \ + src/decoder/ogg_codec.c src/decoder/ogg_codec.h endif if ENABLE_VORBIS_DECODER @@ -582,7 +575,14 @@ libdecoder_plugins_a_SOURCES += \ endif if HAVE_FLAC -libdecoder_plugins_a_SOURCES += src/decoder/flac_decoder_plugin.c +libdecoder_plugins_a_SOURCES += \ + src/decoder/FLACInput.cxx src/decoder/FLACInput.hxx \ + src/decoder/FLACIOHandle.cxx src/decoder/FLACIOHandle.hxx \ + src/decoder/FLACMetaData.cxx src/decoder/FLACMetaData.hxx \ + src/decoder/FLAC_PCM.cxx src/decoder/FLAC_PCM.hxx \ + src/decoder/FLACCommon.cxx src/decoder/FLACCommon.hxx \ + src/decoder/FLACDecoderPlugin.cxx \ + src/decoder/FLACDecoderPlugin.h endif if HAVE_AUDIOFILE @@ -639,6 +639,7 @@ libencoder_plugins_a_CPPFLAGS = $(AM_CPPFLAGS) \ $(LAME_CFLAGS) \ $(TWOLAME_CFLAGS) \ $(patsubst -I%/FLAC,-I%,$(FLAC_CFLAGS)) \ + $(OPUS_CFLAGS) \ $(VORBISENC_CFLAGS) ENCODER_LIBS = \ @@ -646,19 +647,28 @@ ENCODER_LIBS = \ $(LAME_LIBS) \ $(TWOLAME_LIBS) \ $(FLAC_LIBS) \ + $(OPUS_LIBS) \ $(VORBISENC_LIBS) -libencoder_plugins_a_SOURCES = - -libencoder_plugins_a_SOURCES += src/encoder_list.c -libencoder_plugins_a_SOURCES += src/encoder/null_encoder.c +libencoder_plugins_a_SOURCES = \ + src/encoder/OggStream.hxx \ + src/encoder/null_encoder.c \ + src/encoder_list.c if ENABLE_WAVE_ENCODER libencoder_plugins_a_SOURCES += src/encoder/wave_encoder.c endif if ENABLE_VORBIS_ENCODER -libencoder_plugins_a_SOURCES += src/encoder/vorbis_encoder.c +libencoder_plugins_a_SOURCES += \ + src/encoder/VorbisEncoderPlugin.cxx \ + src/encoder/VorbisEncoderPlugin.hxx +endif + +if HAVE_OPUS +libencoder_plugins_a_SOURCES += \ + src/encoder/OpusEncoderPlugin.cxx \ + src/encoder/OpusEncoderPlugin.hxx endif if ENABLE_LAME_ENCODER @@ -770,16 +780,17 @@ OUTPUT_LIBS = \ $(SHOUT_LIBS) OUTPUT_API_SRC = \ - src/output_list.c \ - src/output_all.c \ - src/output_thread.c \ - src/output_control.c \ - 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 + src/OutputList.cxx src/OutputList.hxx \ + src/OutputAll.cxx \ + src/OutputThread.cxx src/OutputThread.hxx \ + src/OutputError.hxx \ + src/OutputControl.cxx src/OutputControl.hxx \ + src/OutputState.cxx src/OutputState.hxx \ + src/OutputPrint.cxx src/OutputPrint.hxx \ + src/OutputCommand.cxx src/OutputCommand.hxx \ + src/OutputPlugin.cxx src/output_plugin.h \ + src/OutputFinish.cxx \ + src/OutputInit.cxx liboutput_plugins_a_SOURCES = \ src/output/null_output_plugin.h \ @@ -990,7 +1001,7 @@ if ENABLE_TEST C_TESTS = \ test/test_byte_reverse \ test/test_pcm \ - test/test_queue_priority + test/TestQueuePriority TESTS = $(C_TESTS) @@ -998,6 +1009,7 @@ noinst_PROGRAMS = \ $(C_TESTS) \ test/read_conf \ test/run_resolver \ + test/DumpDatabase \ test/run_input \ test/dump_text_file \ test/dump_playlist \ @@ -1028,6 +1040,23 @@ test_run_resolver_LDADD = \ test_run_resolver_SOURCES = test/run_resolver.c \ src/resolver.c +test_DumpDatabase_LDADD = \ + $(DB_LIBS) \ + libutil.a \ + $(GLIB_LIBS) +test_DumpDatabase_SOURCES = test/DumpDatabase.cxx \ + src/DatabaseRegistry.cxx \ + src/DatabaseSelection.cxx \ + src/Directory.cxx src/DirectorySave.cxx \ + src/PlaylistVector.cxx src/PlaylistDatabase.cxx \ + src/DatabaseLock.cxx src/DatabaseSave.cxx \ + src/Song.cxx src/song_sort.c src/SongSave.cxx \ + src/tag.c src/tag_pool.c src/TagSave.cxx \ + src/path.c \ + src/SongFilter.cxx \ + src/TextFile.cxx \ + src/conf.c src/tokenizer.c src/utils.c src/string_util.c + test_run_input_LDADD = \ $(INPUT_LIBS) \ $(ARCHIVE_LIBS) \ @@ -1036,7 +1065,7 @@ test_run_input_SOURCES = test/run_input.c \ test/stdbin.h \ 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/tag.c src/tag_pool.c src/TagSave.cxx \ src/fd_util.c test_dump_text_file_LDADD = \ @@ -1060,12 +1089,12 @@ test_dump_playlist_LDADD = \ $(TAG_LIBS) \ libutil.a \ $(GLIB_LIBS) -test_dump_playlist_SOURCES = test/dump_playlist.c \ +test_dump_playlist_SOURCES = test/dump_playlist.cxx \ $(DECODER_SRC) \ 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/Song.cxx src/tag.c src/tag_pool.c src/TagSave.cxx \ src/tag_handler.c src/tag_file.c \ src/audio_check.c src/pcm_buffer.c \ src/text_input_stream.c src/fifo_buffer.c \ @@ -1074,8 +1103,8 @@ test_dump_playlist_SOURCES = test/dump_playlist.c \ if HAVE_FLAC test_dump_playlist_SOURCES += \ - src/replay_gain_info.c \ - src/decoder/flac_metadata.c + src/ReplayGainInfo.cxx \ + src/decoder/FLACMetaData.cxx endif test_run_decoder_LDADD = \ @@ -1091,7 +1120,7 @@ test_run_decoder_SOURCES = test/run_decoder.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/tag_handler.c \ - src/replay_gain_info.c \ + src/ReplayGainInfo.cxx \ src/uri.c \ src/fd_util.c \ src/audio_check.c \ @@ -1113,7 +1142,7 @@ test_read_tags_SOURCES = test/read_tags.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/tag_handler.c \ - src/replay_gain_info.c \ + src/ReplayGainInfo.cxx \ src/uri.c \ src/fd_util.c \ src/audio_check.c \ @@ -1141,8 +1170,8 @@ test_run_filter_SOURCES = test/run_filter.c \ src/audio_check.c \ src/audio_format.c \ src/audio_parser.c \ - src/replay_gain_config.c \ - src/replay_gain_info.c \ + src/ReplayGainConfig.cxx \ + src/ReplayGainInfo.cxx \ src/AudioCompress/compress.c if ENABLE_DESPOTIFY @@ -1231,7 +1260,7 @@ test_run_output_LDADD = $(MPD_LIBS) \ $(FILTER_LIBS) \ libutil.a \ $(GLIB_LIBS) -test_run_output_SOURCES = test/run_output.c \ +test_run_output_SOURCES = test/run_output.cxx \ test/stdbin.h \ src/conf.c src/tokenizer.c src/utils.c src/string_util.c src/log.c \ src/io_thread.c src/io_thread.h \ @@ -1244,16 +1273,16 @@ test_run_output_SOURCES = test/run_output.c \ src/page.c \ src/socket_util.c \ src/resolver.c \ - src/output_init.c src/output_finish.c src/output_list.c \ - src/output_plugin.c \ + src/OutputInit.cxx src/OutputFinish.cxx src/OutputList.cxx \ + src/OutputPlugin.cxx \ src/mixer_api.c \ src/mixer_control.c \ src/mixer_type.c \ src/filter_plugin.c \ src/filter_config.c \ src/AudioCompress/compress.c \ - src/replay_gain_info.c \ - src/replay_gain_config.c \ + src/ReplayGainInfo.cxx \ + src/ReplayGainConfig.cxx \ src/fd_util.c \ src/server_socket.c @@ -1282,12 +1311,12 @@ TESTS += test/test_archive_iso9660.sh endif if ENABLE_INOTIFY -noinst_PROGRAMS += test/run_inotify -test_run_inotify_SOURCES = test/run_inotify.c \ +noinst_PROGRAMS += test/RunInotify +test_RunInotify_SOURCES = test/RunInotify.c \ src/fd_util.c \ src/fifo_buffer.c \ - src/inotify_source.c -test_run_inotify_LDADD = $(GLIB_LIBS) + src/InotifySource.cxx +test_RunInotify_LDADD = $(GLIB_LIBS) endif test_test_byte_reverse_SOURCES = \ @@ -1308,13 +1337,12 @@ test_test_pcm_LDADD = \ libutil.a \ $(GLIB_LIBS) -test_test_queue_priority_SOURCES = \ - src/queue.c \ - test/test_queue_priority.c -test_test_queue_priority_LDADD = \ +test_TestQueuePriority_SOURCES = \ + src/Queue.cxx \ + test/TestQueuePriority.cxx +test_TestQueuePriority_LDADD = \ $(GLIB_LIBS) -if HAVE_CXX noinst_PROGRAMS += src/dsd2pcm/dsd2pcm src_dsd2pcm_dsd2pcm_SOURCES = \ @@ -1322,7 +1350,6 @@ src_dsd2pcm_dsd2pcm_SOURCES = \ src/dsd2pcm/noiseshape.c src/dsd2pcm/noiseshape.h \ src/dsd2pcm/main.cpp src_dsd2pcm_dsd2pcm_LDADD = libutil.a -endif endif |