diff options
Diffstat (limited to '')
| -rw-r--r-- | Makefile.am | 1325 |
1 files changed, 857 insertions, 468 deletions
diff --git a/Makefile.am b/Makefile.am index c7cf631bb..cb98575b6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,32 +5,42 @@ AM_CPPFLAGS += -I$(srcdir)/src $(GLIB_CFLAGS) AM_CPPFLAGS += -DSYSTEM_CONFIG_FILE_LOCATION='"$(sysconfdir)/mpd.conf"' +if ANDROID +else bin_PROGRAMS = src/mpd +endif noinst_LIBRARIES = \ + libmpd.a \ libutil.a \ libthread.a \ libsystem.a \ libevent.a \ + libicu.a \ libpcm.a \ libconf.a \ libtag.a \ libinput.a \ libfs.a \ - libdb_plugins.a \ libplaylist_plugins.a \ - libdecoder_plugins.a \ + libdecoder.a \ libfilter_plugins.a \ libmixer_plugins.a \ liboutput_plugins.a -src_mpd_CPPFLAGS = $(AM_CPPFLAGS) \ +libmpd_a_DEPENDENCIES = + +libmpd_a_CPPFLAGS = $(AM_CPPFLAGS) \ $(LIBMPDCLIENT_CFLAGS) \ $(AVAHI_CFLAGS) \ $(LIBWRAP_CFLAGS) \ $(SQLITE_CFLAGS) + src_mpd_LDADD = \ + libmpd.a \ + $(NEIGHBOR_LIBS) \ $(DB_LIBS) \ + $(STORAGE_LIBS) \ $(PLAYLIST_LIBS) \ $(AVAHI_LIBS) \ $(LIBWRAP_LDFLAGS) \ @@ -47,29 +57,22 @@ src_mpd_LDADD = \ libevent.a \ libthread.a \ libsystem.a \ + $(ICU_LDADD) \ libutil.a \ libfs.a \ $(SYSTEMD_DAEMON_LIBS) \ $(GLIB_LIBS) -mpd_headers = \ - src/check.h \ - src/gerror.h \ - src/TextInputStream.hxx \ - src/AudioCompress/config.h \ - src/AudioCompress/compress.h \ - src/open.h \ - src/Playlist.hxx \ - src/poison.h \ - src/TimePrint.cxx src/TimePrint.hxx \ - src/Timer.hxx - src_mpd_SOURCES = \ - $(mpd_headers) \ - $(DECODER_SRC) \ + src/Main.cxx src/Main.hxx + +libmpd_a_SOURCES = \ $(OUTPUT_API_SRC) \ $(MIXER_API_SRC) \ + src/check.h \ src/Compiler.h \ + src/open.h \ + src/poison.h \ src/notify.cxx src/notify.hxx \ src/AudioConfig.cxx src/AudioConfig.hxx \ src/CheckAudioFormat.cxx src/CheckAudioFormat.hxx \ @@ -82,169 +85,266 @@ src_mpd_SOURCES = \ src/command/CommandError.cxx src/command/CommandError.hxx \ src/command/AllCommands.cxx src/command/AllCommands.hxx \ src/command/QueueCommands.cxx src/command/QueueCommands.hxx \ + src/command/TagCommands.cxx src/command/TagCommands.hxx \ src/command/PlayerCommands.cxx src/command/PlayerCommands.hxx \ src/command/PlaylistCommands.cxx src/command/PlaylistCommands.hxx \ - src/command/DatabaseCommands.cxx src/command/DatabaseCommands.hxx \ src/command/FileCommands.cxx src/command/FileCommands.hxx \ src/command/OutputCommands.cxx src/command/OutputCommands.hxx \ src/command/MessageCommands.cxx src/command/MessageCommands.hxx \ src/command/OtherCommands.cxx src/command/OtherCommands.hxx \ src/command/CommandListBuilder.cxx src/command/CommandListBuilder.hxx \ src/Idle.cxx src/Idle.hxx \ - src/CommandLine.cxx src/CommandLine.hxx \ src/CrossFade.cxx src/CrossFade.hxx \ - src/cue/CueParser.cxx src/cue/CueParser.hxx \ - src/DecoderError.cxx src/DecoderError.hxx \ - src/DecoderThread.cxx src/DecoderThread.hxx \ - src/DecoderCommand.hxx \ - src/DecoderControl.cxx src/DecoderControl.hxx \ - src/DecoderAPI.cxx src/DecoderAPI.hxx \ - src/DecoderPlugin.hxx \ - 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/DatabaseError.cxx src/DatabaseError.hxx \ - 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/FilterConfig.cxx src/FilterConfig.hxx \ - src/FilterPlugin.cxx src/FilterPlugin.hxx \ - src/FilterInternal.hxx \ - src/FilterRegistry.cxx src/FilterRegistry.hxx \ - src/UpdateDomain.cxx src/UpdateDomain.hxx \ - 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/Client.cxx src/Client.hxx \ - src/ClientInternal.hxx \ - src/ClientEvent.cxx \ - src/ClientExpire.cxx \ - src/ClientGlobal.cxx \ - src/ClientIdle.cxx \ - src/ClientList.cxx src/ClientList.hxx \ - src/ClientNew.cxx \ - src/ClientProcess.cxx \ - src/ClientRead.cxx \ - src/ClientWrite.cxx \ - src/ClientMessage.cxx src/ClientMessage.hxx \ - src/ClientSubscribe.cxx \ - src/ClientFile.cxx src/ClientFile.hxx \ + src/decoder/DecoderError.cxx src/decoder/DecoderError.hxx \ + src/decoder/DecoderThread.cxx src/decoder/DecoderThread.hxx \ + src/decoder/DecoderCommand.hxx \ + src/decoder/DecoderControl.cxx src/decoder/DecoderControl.hxx \ + src/decoder/DecoderAPI.cxx src/decoder/DecoderAPI.hxx \ + src/decoder/DecoderPlugin.hxx \ + src/decoder/DecoderInternal.cxx src/decoder/DecoderInternal.hxx \ + src/decoder/DecoderPrint.cxx src/decoder/DecoderPrint.hxx \ + src/filter/FilterConfig.cxx src/filter/FilterConfig.hxx \ + src/filter/FilterPlugin.cxx src/filter/FilterPlugin.hxx \ + src/filter/FilterInternal.hxx \ + src/filter/FilterRegistry.cxx src/filter/FilterRegistry.hxx \ + src/client/Client.cxx src/client/Client.hxx \ + src/client/ClientInternal.hxx \ + src/client/ClientEvent.cxx \ + src/client/ClientExpire.cxx \ + src/client/ClientGlobal.cxx \ + src/client/ClientIdle.cxx \ + src/client/ClientList.cxx src/client/ClientList.hxx \ + src/client/ClientNew.cxx \ + src/client/ClientProcess.cxx \ + src/client/ClientRead.cxx \ + src/client/ClientWrite.cxx \ + src/client/ClientMessage.cxx src/client/ClientMessage.hxx \ + src/client/ClientSubscribe.cxx \ + src/client/ClientFile.cxx \ src/Listen.cxx src/Listen.hxx \ src/LogInit.cxx src/LogInit.hxx \ + src/LogBackend.cxx src/LogBackend.hxx \ src/Log.cxx src/Log.hxx src/LogV.hxx \ + src/LogLevel.hxx \ src/ls.cxx src/ls.hxx \ src/IOThread.cxx src/IOThread.hxx \ - src/Main.cxx src/Main.hxx \ src/Instance.cxx src/Instance.hxx \ - src/Win32Main.cxx \ + src/win32/Win32Main.cxx \ src/GlobalEvents.cxx src/GlobalEvents.hxx \ - src/Daemon.cxx src/Daemon.hxx \ - src/AudioCompress/compress.c \ src/MixRampInfo.hxx \ src/MusicBuffer.cxx src/MusicBuffer.hxx \ src/MusicPipe.cxx src/MusicPipe.hxx \ src/MusicChunk.cxx src/MusicChunk.hxx \ src/Mapper.cxx src/Mapper.hxx \ - src/Page.cxx src/Page.hxx \ src/Partition.cxx 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/PlayerListener.hxx \ src/PlaylistError.cxx src/PlaylistError.hxx \ src/PlaylistGlobal.cxx src/PlaylistGlobal.hxx \ - 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/PlaylistDatabase.hxx \ - src/PlaylistUpdate.cxx \ - src/IdTable.hxx \ - src/Queue.cxx src/Queue.hxx \ - src/QueuePrint.cxx src/QueuePrint.hxx \ - src/QueueSave.cxx src/QueueSave.hxx \ + src/playlist/PlaylistStream.cxx src/playlist/PlaylistStream.hxx \ + src/playlist/PlaylistMapper.cxx src/playlist/PlaylistMapper.hxx \ + src/playlist/PlaylistAny.cxx src/playlist/PlaylistAny.hxx \ + src/playlist/PlaylistSong.cxx src/playlist/PlaylistSong.hxx \ + src/playlist/PlaylistQueue.cxx src/playlist/PlaylistQueue.hxx \ + src/playlist/Print.cxx src/playlist/Print.hxx \ + src/db/PlaylistVector.cxx src/db/PlaylistVector.hxx \ + src/db/PlaylistInfo.hxx \ + src/queue/IdTable.hxx \ + src/queue/Queue.cxx src/queue/Queue.hxx \ + src/queue/QueuePrint.cxx src/queue/QueuePrint.hxx \ + src/queue/QueueSave.cxx src/queue/QueueSave.hxx \ + src/queue/Playlist.cxx src/queue/Playlist.hxx \ + src/queue/PlaylistControl.cxx \ + src/queue/PlaylistEdit.cxx \ + src/queue/PlaylistTag.cxx \ + src/queue/PlaylistState.cxx src/queue/PlaylistState.hxx \ src/ReplayGainConfig.cxx src/ReplayGainConfig.hxx \ src/ReplayGainInfo.cxx src/ReplayGainInfo.hxx \ - src/SignalHandlers.cxx src/SignalHandlers.hxx \ - src/Song.cxx src/Song.hxx \ + src/DetachedSong.cxx src/DetachedSong.hxx \ src/SongUpdate.cxx \ + src/SongLoader.cxx src/SongLoader.hxx \ src/SongPrint.cxx src/SongPrint.hxx \ src/SongSave.cxx src/SongSave.hxx \ - src/SongSort.cxx src/SongSort.hxx \ src/StateFile.cxx src/StateFile.hxx \ src/Stats.cxx src/Stats.hxx \ src/TagPrint.cxx src/TagPrint.hxx \ src/TagSave.cxx src/TagSave.hxx \ src/TagFile.cxx src/TagFile.hxx \ - src/TextFile.cxx src/TextFile.hxx \ - src/TextInputStream.cxx \ - src/Volume.cxx src/Volume.hxx \ + src/TagStream.cxx src/TagStream.hxx \ + src/TimePrint.cxx src/TimePrint.hxx \ + src/mixer/Volume.cxx src/mixer/Volume.hxx \ src/SongFilter.cxx src/SongFilter.hxx \ - src/SongPointer.hxx \ - src/PlaylistFile.cxx src/PlaylistFile.hxx \ - src/Timer.cxx + src/PlaylistFile.cxx src/PlaylistFile.hxx + +if ANDROID +else +libmpd_a_SOURCES += \ + src/unix/SignalHandlers.cxx src/unix/SignalHandlers.hxx \ + src/unix/Daemon.cxx src/unix/Daemon.hxx \ + src/unix/PidFile.hxx \ + src/CommandLine.cxx src/CommandLine.hxx +endif + +if ENABLE_DATABASE +libmpd_a_SOURCES += \ + src/queue/PlaylistUpdate.cxx \ + src/command/StorageCommands.cxx src/command/StorageCommands.hxx \ + src/command/DatabaseCommands.cxx src/command/DatabaseCommands.hxx \ + src/db/LightSong.cxx src/db/LightSong.hxx \ + src/db/LightDirectory.hxx \ + src/db/update/UpdateDomain.cxx src/db/update/UpdateDomain.hxx \ + src/db/update/Service.cxx src/db/update/Service.hxx \ + src/db/update/Queue.cxx src/db/update/Queue.hxx \ + src/db/update/UpdateIO.cxx src/db/update/UpdateIO.hxx \ + src/db/update/Editor.cxx src/db/update/Editor.hxx \ + src/db/update/Walk.cxx src/db/update/Walk.hxx \ + src/db/update/UpdateSong.cxx \ + src/db/update/Container.cxx \ + src/db/update/Remove.cxx src/db/update/Remove.hxx \ + src/db/update/ExcludeList.cxx src/db/update/ExcludeList.hxx \ + src/db/Uri.hxx \ + src/db/DatabaseGlue.cxx src/db/DatabaseGlue.hxx \ + src/db/Configured.cxx src/db/Configured.hxx \ + src/db/DatabaseSong.cxx src/db/DatabaseSong.hxx \ + src/db/DatabasePrint.cxx src/db/DatabasePrint.hxx \ + src/db/DatabaseQueue.cxx src/db/DatabaseQueue.hxx \ + src/db/DatabasePlaylist.cxx src/db/DatabasePlaylist.hxx \ + src/db/DatabaseError.cxx src/db/DatabaseError.hxx \ + src/db/DatabaseLock.cxx src/db/DatabaseLock.hxx \ + src/db/DatabasePlugin.hxx \ + src/db/Interface.hxx \ + src/db/Stats.hxx \ + src/db/DatabaseListener.hxx \ + src/db/Visitor.hxx \ + src/db/Selection.cxx src/db/Selection.hxx +endif + +UPNP_SOURCES = \ + src/lib/upnp/Init.cxx src/lib/upnp/Init.hxx \ + src/lib/upnp/ClientInit.cxx src/lib/upnp/ClientInit.hxx \ + src/lib/upnp/Device.cxx src/lib/upnp/Device.hxx \ + src/lib/upnp/ContentDirectoryService.cxx src/lib/upnp/ContentDirectoryService.hxx \ + src/lib/upnp/Discovery.cxx src/lib/upnp/Discovery.hxx \ + src/lib/upnp/Domain.cxx src/lib/upnp/Domain.hxx \ + src/lib/upnp/ixmlwrap.cxx src/lib/upnp/ixmlwrap.hxx \ + src/lib/upnp/Callback.hxx \ + src/lib/upnp/Util.cxx src/lib/upnp/Util.hxx \ + src/lib/upnp/WorkQueue.hxx \ + src/lib/upnp/Action.hxx + +# +# Android native library +# + +if ANDROID + +noinst_LIBRARIES += libjava.a +libjava_a_SOURCES = \ + src/java/Class.hxx \ + src/java/Exception.hxx \ + src/java/Global.cxx src/java/Global.hxx \ + src/java/Object.hxx \ + src/java/Ref.hxx \ + src/java/File.cxx src/java/File.hxx \ + src/java/String.cxx src/java/String.hxx + +noinst_LIBRARIES += libandroid.a +libandroid_a_SOURCES = \ + src/android/Context.cxx src/android/Context.hxx \ + src/android/Environment.cxx src/android/Environment.hxx +libandroid_a_CPPFLAGS = $(AM_CPPFLAGS) -Iandroid/build/include + +noinst_LIBRARIES += libmain.a +libmain_a_SOURCES = \ + src/Main.cxx src/Main.hxx +libmain_a_CPPFLAGS = $(AM_CPPFLAGS) -Iandroid/build/include + +src_mpd_LDADD += libandroid.a libjava.a + +all-local: android/build/bin/Main-debug.apk +clean-local: + rm -rf android/build + +libmpd.so: $(filter %.a,$(src_mpd_LDADD)) libmain.a + $(AM_V_CXXLD)$(CXXLD) -shared -Wl,--no-undefined,-shared,-Bsymbolic -llog -lz -o $@ $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) src/libmain_a-Main.o $(src_mpd_LDADD) $(LIBS) + +android/build/build.xml: android/AndroidManifest.xml + rm -rf android/build + mkdir -p android/build/include + ln -s $(srcdir)/android/AndroidManifest.xml $(srcdir)/android/custom_rules.xml $(srcdir)/android/src $(srcdir)/android/res android/build + $(ANDROID_SDK)/tools/android update project --path android/build --target android-17 + +android/build/bin/classes/org/musicpd/Bridge.class: android/src/Bridge.java android/build/build.xml + cd android/build && ant compile-jni-classes + +android/build/include/org_musicpd_Bridge.h: android/build/bin/classes/org/musicpd/Bridge.class + javah -classpath $(ANDROID_SDK)/platforms/android-17/android.jar:android/build/bin/classes -d $(@D) org.musicpd.Bridge + +libmpd_a_DEPENDENCIES += android/build/include/org_musicpd_Bridge.h + +android/build/libs/armeabi-v7a/libmpd.so: libmpd.so android/build/build.xml + mkdir -p $(@D) + rm -f $@ + $(STRIP) -o $@ $< + +android/build/bin/Main-debug.apk: android/build/build.xml android/build/libs/armeabi-v7a/libmpd.so + cd android/build && ant nodeps debug + +android/build/bin/Main-release-unsigned.apk: android/build/build.xml android/build/libs/armeabi-v7a/libmpd.so + cd android/build && ant nodeps release + +android/build/bin/Main-release-unaligned.apk: android/build/bin/Main-release-unsigned.apk + jarsigner -digestalg SHA1 -sigalg MD5withRSA -storepass:env ANDROID_KEYSTORE_PASS -keystore $(ANDROID_KEYSTORE) -signedjar $@ $< $(ANDROID_KEY_ALIAS) + +android/build/bin/Main.apk: android/build/bin/Main-release-unaligned.apk + $(ANDROID_SDK)/tools/zipalign -f 4 $< $@ + +endif # # Windows resource file # -src/win/mpd_win32_rc.$(OBJEXT): src/win/mpd_win32_rc.rc +src/win32/mpd_win32_rc.$(OBJEXT): src/win32/mpd_win32_rc.rc $(WINDRES) -i $< -o $@ if HAVE_WINDOWS -noinst_DATA = src/win/mpd_win32_rc.rc +noinst_DATA = src/win32/mpd_win32_rc.rc -src_mpd_DEPENDENCIES = src/win/mpd_win32_rc.$(OBJEXT) -src_mpd_LDFLAGS = -Wl,src/win/mpd_win32_rc.$(OBJEXT) -endif - -if ENABLE_DESPOTIFY -src_mpd_SOURCES += \ - src/DespotifyUtils.cxx src/DespotifyUtils.hxx +src_mpd_DEPENDENCIES = src/win32/mpd_win32_rc.$(OBJEXT) +src_mpd_LDFLAGS = -Wl,src/win32/mpd_win32_rc.$(OBJEXT) endif +if ENABLE_DATABASE if ENABLE_INOTIFY -src_mpd_SOURCES += \ - src/InotifyDomain.cxx src/InotifyDomain.hxx \ - src/InotifySource.cxx src/InotifySource.hxx \ - src/InotifyQueue.cxx src/InotifyQueue.hxx \ - src/InotifyUpdate.cxx src/InotifyUpdate.hxx +libmpd_a_SOURCES += \ + src/db/update/InotifyDomain.cxx src/db/update/InotifyDomain.hxx \ + src/db/update/InotifySource.cxx src/db/update/InotifySource.hxx \ + src/db/update/InotifyQueue.cxx src/db/update/InotifyQueue.hxx \ + src/db/update/InotifyUpdate.cxx src/db/update/InotifyUpdate.hxx +endif endif if ENABLE_SQLITE -src_mpd_SOURCES += \ +libmpd_a_SOURCES += \ src/command/StickerCommands.cxx src/command/StickerCommands.hxx \ - src/StickerDatabase.cxx src/StickerDatabase.hxx \ - src/StickerPrint.cxx src/StickerPrint.hxx \ - src/SongSticker.cxx src/SongSticker.hxx + src/sticker/StickerDatabase.cxx src/sticker/StickerDatabase.hxx \ + src/sticker/StickerPrint.cxx src/sticker/StickerPrint.hxx \ + src/sticker/SongSticker.cxx src/sticker/SongSticker.hxx endif # Generic utility library libutil_a_SOURCES = \ src/util/Macros.hxx \ + src/util/Cast.hxx \ + src/util/Clamp.hxx \ + src/util/Alloc.cxx src/util/Alloc.hxx \ + src/util/VarSize.hxx \ src/util/Error.cxx src/util/Error.hxx \ src/util/Domain.hxx \ src/util/ReusableArray.hxx \ @@ -252,19 +352,23 @@ libutil_a_SOURCES = \ src/util/CharUtil.hxx \ src/util/NumberParser.hxx \ src/util/StringUtil.cxx src/util/StringUtil.hxx \ + src/util/SplitString.cxx src/util/SplitString.hxx \ src/util/FormatString.cxx src/util/FormatString.hxx \ src/util/Tokenizer.cxx src/util/Tokenizer.hxx \ src/util/UriUtil.cxx src/util/UriUtil.hxx \ src/util/Manual.hxx \ src/util/RefCount.hxx \ - src/util/fifo_buffer.c src/util/fifo_buffer.h \ src/util/FifoBuffer.hxx \ + src/util/DynamicFifoBuffer.hxx \ + src/util/ConstBuffer.hxx \ src/util/WritableBuffer.hxx \ - src/util/growing_fifo.c src/util/growing_fifo.h \ + src/util/CircularBuffer.hxx \ src/util/LazyRandomEngine.cxx src/util/LazyRandomEngine.hxx \ src/util/SliceBuffer.hxx \ src/util/HugeAllocator.cxx src/util/HugeAllocator.hxx \ src/util/PeakBuffer.cxx src/util/PeakBuffer.hxx \ + src/util/OptionParser.cxx src/util/OptionParser.hxx \ + src/util/OptionDef.hxx \ src/util/list.h \ src/util/list_sort.c src/util/list_sort.h \ src/util/ByteReverse.cxx src/util/ByteReverse.hxx \ @@ -273,6 +377,8 @@ libutil_a_SOURCES = \ # Multi-threading library libthread_a_SOURCES = \ + src/thread/Util.hxx \ + src/thread/Name.hxx \ src/thread/Mutex.hxx \ src/thread/PosixMutex.hxx \ src/thread/CriticalSection.hxx \ @@ -297,12 +403,18 @@ libsystem_a_SOURCES = \ src/system/EventFD.cxx src/system/EventFD.hxx \ src/system/SignalFD.cxx src/system/SignalFD.hxx \ src/system/EPollFD.cxx src/system/EPollFD.hxx \ + src/system/PeriodClock.hxx \ src/system/Clock.cxx src/system/Clock.hxx # Event loop library libevent_a_SOURCES = \ src/event/WakeFD.hxx \ + src/event/PollGroup.hxx \ + src/event/PollGroupEPoll.hxx \ + src/event/PollGroupPoll.hxx src/event/PollGroupPoll.cxx \ + src/event/PollGroupWinSelect.hxx src/event/PollGroupWinSelect.cxx \ + src/event/PollResultGeneric.hxx \ src/event/SignalMonitor.hxx src/event/SignalMonitor.cxx \ src/event/TimeoutMonitor.hxx src/event/TimeoutMonitor.cxx \ src/event/IdleMonitor.hxx src/event/IdleMonitor.cxx \ @@ -315,35 +427,59 @@ libevent_a_SOURCES = \ src/event/Call.hxx src/event/Call.cxx \ src/event/Loop.cxx src/event/Loop.hxx +# UTF-8 library + +libicu_a_SOURCES = \ + src/lib/icu/Collate.cxx src/lib/icu/Collate.hxx \ + src/lib/icu/Error.cxx src/lib/icu/Error.hxx + +ICU_LDADD = libicu.a $(ICU_LIBS) + # PCM library libpcm_a_SOURCES = \ + src/pcm/Domain.cxx src/pcm/Domain.hxx \ + src/pcm/Traits.hxx \ src/pcm/PcmBuffer.cxx src/pcm/PcmBuffer.hxx \ src/pcm/PcmExport.cxx src/pcm/PcmExport.hxx \ src/pcm/PcmConvert.cxx src/pcm/PcmConvert.hxx \ src/pcm/dsd2pcm/dsd2pcm.c src/pcm/dsd2pcm/dsd2pcm.h \ src/pcm/PcmDsd.cxx src/pcm/PcmDsd.hxx \ src/pcm/PcmDsdUsb.cxx src/pcm/PcmDsdUsb.hxx \ - src/pcm/PcmVolume.cxx src/pcm/PcmVolume.hxx \ + src/pcm/Volume.cxx src/pcm/Volume.hxx \ src/pcm/PcmMix.cxx src/pcm/PcmMix.hxx \ src/pcm/PcmChannels.cxx src/pcm/PcmChannels.hxx \ src/pcm/PcmPack.cxx src/pcm/PcmPack.hxx \ src/pcm/PcmFormat.cxx src/pcm/PcmFormat.hxx \ - src/pcm/PcmResample.cxx src/pcm/PcmResample.hxx \ - src/pcm/PcmResampleFallback.cxx \ - src/pcm/PcmResampleInternal.hxx \ + src/pcm/FloatConvert.hxx \ + src/pcm/ShiftConvert.hxx \ + src/pcm/Neon.hxx \ + src/pcm/FormatConverter.cxx src/pcm/FormatConverter.hxx \ + src/pcm/ChannelsConverter.cxx src/pcm/ChannelsConverter.hxx \ + src/pcm/Resampler.hxx \ + src/pcm/GlueResampler.cxx src/pcm/GlueResampler.hxx \ + src/pcm/FallbackResampler.cxx src/pcm/FallbackResampler.hxx \ + src/pcm/ConfiguredResampler.cxx src/pcm/ConfiguredResampler.hxx \ src/pcm/PcmDither.cxx src/pcm/PcmDither.hxx \ src/pcm/PcmPrng.hxx \ src/pcm/PcmUtils.hxx libpcm_a_CPPFLAGS = $(AM_CPPFLAGS) \ + $(SOXR_CFLAGS) \ $(SAMPLERATE_CFLAGS) PCM_LIBS = \ libpcm.a \ + $(SOXR_LIBS) \ $(SAMPLERATE_LIBS) if HAVE_LIBSAMPLERATE -libpcm_a_SOURCES += src/pcm/PcmResampleLibsamplerate.cxx +libpcm_a_SOURCES += \ + src/pcm/LibsamplerateResampler.cxx src/pcm/LibsamplerateResampler.hxx +endif + +if HAVE_SOXR +libpcm_a_SOURCES += \ + src/pcm/SoxrResampler.cxx src/pcm/SoxrResampler.hxx endif # File system library @@ -356,42 +492,162 @@ libfs_a_SOURCES = \ src/fs/Charset.cxx src/fs/Charset.hxx \ src/fs/Path.cxx src/fs/Path.hxx \ src/fs/AllocatedPath.cxx src/fs/AllocatedPath.hxx \ + src/fs/TextFile.cxx src/fs/TextFile.hxx \ src/fs/FileSystem.cxx src/fs/FileSystem.hxx \ + src/fs/StandardDirectory.cxx src/fs/StandardDirectory.hxx \ + src/fs/CheckFile.cxx src/fs/CheckFile.hxx \ src/fs/DirectoryReader.hxx +# Storage library + +SMBCLIENT_SOURCES = \ + src/lib/smbclient/Domain.cxx src/lib/smbclient/Domain.hxx \ + src/lib/smbclient/Mutex.cxx src/lib/smbclient/Mutex.hxx \ + src/lib/smbclient/Init.cxx src/lib/smbclient/Init.hxx + +if ENABLE_DATABASE + +noinst_LIBRARIES += libstorage.a + +libstorage_a_SOURCES = \ + src/storage/StoragePlugin.hxx \ + src/storage/Registry.cxx src/storage/Registry.hxx \ + src/storage/StorageInterface.cxx src/storage/StorageInterface.hxx \ + src/storage/CompositeStorage.cxx src/storage/CompositeStorage.hxx \ + src/storage/Configured.cxx src/storage/Configured.hxx \ + src/storage/plugins/LocalStorage.cxx src/storage/plugins/LocalStorage.hxx \ + src/storage/FileInfo.hxx + +libstorage_a_CPPFLAGS = $(AM_CPPFLAGS) \ + $(NFS_CFLAGS) \ + $(SMBCLIENT_CFLAGS) + +STORAGE_LIBS = libstorage.a + +if ENABLE_SMBCLIENT +libstorage_a_SOURCES += \ + $(SMBCLIENT_SOURCES) \ + src/storage/plugins/SmbclientStorage.cxx src/neighbor/plugins/SmbclientStorage.hxx +endif + +if ENABLE_NFS +libstorage_a_SOURCES += \ + src/lib/nfs/Domain.cxx src/lib/nfs/Domain.hxx \ + src/storage/plugins/NfsStorage.cxx src/neighbor/plugins/NfsStorage.hxx +endif + +endif + +# neighbor plugins + +if ENABLE_NEIGHBOR_PLUGINS + +libmpd_a_SOURCES += \ + src/command/NeighborCommands.cxx \ + src/command/NeighborCommands.hxx + +noinst_LIBRARIES += libneighbor.a + +libneighbor_a_SOURCES = \ + src/neighbor/Registry.cxx src/neighbor/Registry.hxx \ + src/neighbor/Glue.cxx src/neighbor/Glue.hxx \ + src/neighbor/Info.hxx \ + src/neighbor/Listener.hxx \ + src/neighbor/Explorer.hxx \ + src/neighbor/NeighborPlugin.hxx + +libneighbor_a_CPPFLAGS = $(AM_CPPFLAGS) \ + $(SMBCLIENT_CFLAGS) + +if ENABLE_SMBCLIENT +libneighbor_a_SOURCES += \ + $(SMBCLIENT_SOURCES) \ + src/neighbor/plugins/SmbclientNeighborPlugin.cxx src/neighbor/plugins/SmbclientNeighborPlugin.hxx +endif + +NEIGHBOR_LIBS = \ + $(SMBCLIENT_LIBS) \ + libneighbor.a + +if HAVE_LIBUPNP +libneighbor_a_SOURCES += \ + $(UPNP_SOURCES) \ + src/neighbor/plugins/UpnpNeighborPlugin.cxx src/neighbor/plugins/UpnpNeighborPlugin.hxx +NEIGHBOR_LIBS += \ + $(EXPAT_LIBS) \ + $(UPNP_LIBS) +endif + +endif + # database plugins +if ENABLE_DATABASE + +noinst_LIBRARIES += libdb_plugins.a + libdb_plugins_a_SOURCES = \ - src/DatabaseRegistry.cxx src/DatabaseRegistry.hxx \ - src/DatabaseHelpers.cxx src/DatabaseHelpers.hxx \ - src/db/SimpleDatabasePlugin.cxx src/db/SimpleDatabasePlugin.hxx + src/PlaylistDatabase.cxx src/PlaylistDatabase.hxx \ + src/db/Registry.cxx src/db/Registry.hxx \ + src/db/Helpers.cxx src/db/Helpers.hxx \ + src/db/plugins/simple/DatabaseSave.cxx \ + src/db/plugins/simple/DatabaseSave.hxx \ + src/db/plugins/simple/DirectorySave.cxx \ + src/db/plugins/simple/DirectorySave.hxx \ + src/db/plugins/LazyDatabase.cxx src/db/plugins/LazyDatabase.hxx \ + src/db/plugins/simple/Directory.cxx \ + src/db/plugins/simple/Directory.hxx \ + src/db/plugins/simple/Song.cxx \ + src/db/plugins/simple/Song.hxx \ + src/db/plugins/simple/SongSort.cxx \ + src/db/plugins/simple/SongSort.hxx \ + src/db/plugins/simple/Mount.cxx \ + src/db/plugins/simple/Mount.hxx \ + src/db/plugins/simple/PrefixedLightSong.hxx \ + src/db/plugins/simple/SimpleDatabasePlugin.cxx \ + src/db/plugins/simple/SimpleDatabasePlugin.hxx if HAVE_LIBMPDCLIENT libdb_plugins_a_SOURCES += \ - src/db/ProxyDatabasePlugin.cxx src/db/ProxyDatabasePlugin.hxx + src/db/plugins/ProxyDatabasePlugin.cxx src/db/plugins/ProxyDatabasePlugin.hxx endif DB_LIBS = \ libdb_plugins.a \ $(LIBMPDCLIENT_LIBS) +if HAVE_LIBUPNP +libdb_plugins_a_SOURCES += \ + $(UPNP_SOURCES) \ + src/db/plugins/upnp/UpnpDatabasePlugin.cxx src/db/plugins/upnp/UpnpDatabasePlugin.hxx \ + src/db/plugins/upnp/Tags.cxx src/db/plugins/upnp/Tags.hxx \ + src/db/plugins/upnp/ContentDirectoryService.cxx \ + src/db/plugins/upnp/Directory.cxx src/db/plugins/upnp/Directory.hxx \ + src/db/plugins/upnp/Object.cxx src/db/plugins/upnp/Object.hxx +DB_LIBS += \ + $(EXPAT_LIBS) \ + $(UPNP_LIBS) +endif + +endif + # archive plugins if ENABLE_ARCHIVE noinst_LIBRARIES += libarchive.a -src_mpd_SOURCES += \ - src/UpdateArchive.cxx src/UpdateArchive.hxx +libmpd_a_SOURCES += \ + src/db/update/Archive.cxx libarchive_a_SOURCES = \ - src/ArchiveDomain.cxx src/ArchiveDomain.hxx \ - src/ArchiveLookup.cxx src/ArchiveLookup.hxx \ - src/ArchiveList.cxx src/ArchiveList.hxx \ - src/ArchivePlugin.cxx src/ArchivePlugin.hxx \ - src/ArchiveVisitor.hxx \ - src/ArchiveFile.hxx \ - src/input/ArchiveInputPlugin.cxx src/input/ArchiveInputPlugin.hxx + src/archive/ArchiveDomain.cxx src/archive/ArchiveDomain.hxx \ + src/archive/ArchiveLookup.cxx src/archive/ArchiveLookup.hxx \ + src/archive/ArchiveList.cxx src/archive/ArchiveList.hxx \ + src/archive/ArchivePlugin.cxx src/archive/ArchivePlugin.hxx \ + src/archive/ArchiveVisitor.hxx \ + src/archive/ArchiveFile.hxx \ + src/input/plugins/ArchiveInputPlugin.cxx src/input/plugins/ArchiveInputPlugin.hxx libarchive_a_CPPFLAGS = $(AM_CPPFLAGS) \ $(BZ2_CFLAGS) \ $(ISO9660_CFLAGS) \ @@ -405,20 +661,20 @@ ARCHIVE_LIBS = \ if HAVE_BZ2 libarchive_a_SOURCES += \ - src/archive/Bzip2ArchivePlugin.cxx \ - src/archive/Bzip2ArchivePlugin.hxx + src/archive/plugins/Bzip2ArchivePlugin.cxx \ + src/archive/plugins/Bzip2ArchivePlugin.hxx endif if HAVE_ZZIP libarchive_a_SOURCES += \ - src/archive/ZzipArchivePlugin.cxx \ - src/archive/ZzipArchivePlugin.hxx + src/archive/plugins/ZzipArchivePlugin.cxx \ + src/archive/plugins/ZzipArchivePlugin.hxx endif if HAVE_ISO9660 libarchive_a_SOURCES += \ - src/archive/Iso9660ArchivePlugin.cxx \ - src/archive/Iso9660ArchivePlugin.hxx + src/archive/plugins/Iso9660ArchivePlugin.cxx \ + src/archive/plugins/Iso9660ArchivePlugin.hxx endif else @@ -428,15 +684,15 @@ endif # configuration library libconf_a_SOURCES = \ - src/ConfigDefaults.hxx \ - src/ConfigPath.cxx src/ConfigPath.hxx \ - src/ConfigData.cxx src/ConfigData.hxx \ - src/ConfigParser.cxx src/ConfigParser.hxx \ - src/ConfigGlobal.cxx src/ConfigGlobal.hxx \ - src/ConfigFile.cxx src/ConfigFile.hxx \ - src/ConfigTemplates.cxx src/ConfigTemplates.hxx \ - src/ConfigError.cxx src/ConfigError.hxx \ - src/ConfigOption.hxx + src/config/ConfigDefaults.hxx \ + src/config/ConfigPath.cxx src/config/ConfigPath.hxx \ + src/config/ConfigData.cxx src/config/ConfigData.hxx \ + src/config/ConfigParser.cxx src/config/ConfigParser.hxx \ + src/config/ConfigGlobal.cxx src/config/ConfigGlobal.hxx \ + src/config/ConfigFile.cxx src/config/ConfigFile.hxx \ + src/config/ConfigTemplates.cxx src/config/ConfigTemplates.hxx \ + src/config/ConfigError.cxx src/config/ConfigError.hxx \ + src/config/ConfigOption.hxx # tag plugins @@ -472,19 +728,19 @@ endif # decoder plugins -libdecoder_plugins_a_SOURCES = \ - src/decoder/PcmDecoderPlugin.cxx \ - src/decoder/PcmDecoderPlugin.hxx \ - src/decoder/DsdiffDecoderPlugin.cxx \ - src/decoder/DsdiffDecoderPlugin.hxx \ - src/decoder/DsfDecoderPlugin.cxx \ - src/decoder/DsfDecoderPlugin.hxx \ - src/decoder/DsdLib.cxx \ - src/decoder/DsdLib.hxx \ - src/DecoderBuffer.cxx src/DecoderBuffer.hxx \ - src/DecoderPlugin.cxx \ - src/DecoderList.cxx src/DecoderList.hxx -libdecoder_plugins_a_CPPFLAGS = $(AM_CPPFLAGS) \ +libdecoder_a_SOURCES = \ + src/decoder/plugins/PcmDecoderPlugin.cxx \ + src/decoder/plugins/PcmDecoderPlugin.hxx \ + src/decoder/plugins/DsdiffDecoderPlugin.cxx \ + src/decoder/plugins/DsdiffDecoderPlugin.hxx \ + src/decoder/plugins/DsfDecoderPlugin.cxx \ + src/decoder/plugins/DsfDecoderPlugin.hxx \ + src/decoder/plugins/DsdLib.cxx \ + src/decoder/plugins/DsdLib.hxx \ + src/decoder/DecoderBuffer.cxx src/decoder/DecoderBuffer.hxx \ + src/decoder/DecoderPlugin.cxx \ + src/decoder/DecoderList.cxx src/decoder/DecoderList.hxx +libdecoder_a_CPPFLAGS = $(AM_CPPFLAGS) \ $(VORBIS_CFLAGS) $(TREMOR_CFLAGS) \ $(patsubst -I%/FLAC,-I%,$(FLAC_CFLAGS)) \ $(SNDFILE_CFLAGS) \ @@ -504,7 +760,7 @@ libdecoder_plugins_a_CPPFLAGS = $(AM_CPPFLAGS) \ $(FAAD_CFLAGS) DECODER_LIBS = \ - libdecoder_plugins.a \ + libdecoder.a \ $(VORBIS_LIBS) $(TREMOR_LIBS) \ $(FLAC_LIBS) \ $(SNDFILE_LIBS) \ @@ -522,141 +778,139 @@ DECODER_LIBS = \ $(ADPLUG_LIBS) \ $(FAAD_LIBS) -DECODER_SRC = - if HAVE_MAD -libdecoder_plugins_a_SOURCES += \ - src/decoder/MadDecoderPlugin.cxx \ - src/decoder/MadDecoderPlugin.hxx +libdecoder_a_SOURCES += \ + src/decoder/plugins/MadDecoderPlugin.cxx \ + src/decoder/plugins/MadDecoderPlugin.hxx endif if HAVE_MPG123 -libdecoder_plugins_a_SOURCES += \ - src/decoder/Mpg123DecoderPlugin.cxx \ - src/decoder/Mpg123DecoderPlugin.hxx +libdecoder_a_SOURCES += \ + src/decoder/plugins/Mpg123DecoderPlugin.cxx \ + src/decoder/plugins/Mpg123DecoderPlugin.hxx endif if HAVE_MPCDEC -libdecoder_plugins_a_SOURCES += \ - src/decoder/MpcdecDecoderPlugin.cxx \ - src/decoder/MpcdecDecoderPlugin.hxx +libdecoder_a_SOURCES += \ + src/decoder/plugins/MpcdecDecoderPlugin.cxx \ + src/decoder/plugins/MpcdecDecoderPlugin.hxx endif if HAVE_OPUS -libdecoder_plugins_a_SOURCES += \ - src/decoder/OggUtil.cxx \ - src/decoder/OggUtil.hxx \ - src/decoder/OggSyncState.hxx \ - src/decoder/OggFind.cxx src/decoder/OggFind.hxx \ - src/decoder/OpusDomain.cxx src/decoder/OpusDomain.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 +libdecoder_a_SOURCES += \ + src/decoder/plugins/OggUtil.cxx \ + src/decoder/plugins/OggUtil.hxx \ + src/decoder/plugins/OggSyncState.hxx \ + src/decoder/plugins/OggFind.cxx src/decoder/plugins/OggFind.hxx \ + src/decoder/plugins/OpusDomain.cxx src/decoder/plugins/OpusDomain.hxx \ + src/decoder/plugins/OpusReader.hxx \ + src/decoder/plugins/OpusHead.hxx \ + src/decoder/plugins/OpusHead.cxx \ + src/decoder/plugins/OpusTags.cxx \ + src/decoder/plugins/OpusTags.hxx \ + src/decoder/plugins/OpusDecoderPlugin.cxx \ + src/decoder/plugins/OpusDecoderPlugin.h endif if HAVE_WAVPACK -libdecoder_plugins_a_SOURCES += \ - src/decoder/WavpackDecoderPlugin.cxx \ - src/decoder/WavpackDecoderPlugin.hxx +libdecoder_a_SOURCES += \ + src/decoder/plugins/WavpackDecoderPlugin.cxx \ + src/decoder/plugins/WavpackDecoderPlugin.hxx endif if HAVE_ADPLUG -libdecoder_plugins_a_SOURCES += \ - src/decoder/AdPlugDecoderPlugin.cxx \ - src/decoder/AdPlugDecoderPlugin.h +libdecoder_a_SOURCES += \ + src/decoder/plugins/AdPlugDecoderPlugin.cxx \ + src/decoder/plugins/AdPlugDecoderPlugin.h endif if HAVE_FAAD -libdecoder_plugins_a_SOURCES += \ - src/decoder/FaadDecoderPlugin.cxx src/decoder/FaadDecoderPlugin.hxx +libdecoder_a_SOURCES += \ + src/decoder/plugins/FaadDecoderPlugin.cxx src/decoder/plugins/FaadDecoderPlugin.hxx endif if HAVE_XIPH -libdecoder_plugins_a_SOURCES += \ - src/decoder/XiphTags.cxx src/decoder/XiphTags.hxx \ - src/decoder/OggCodec.cxx src/decoder/OggCodec.hxx +libdecoder_a_SOURCES += \ + src/decoder/plugins/XiphTags.cxx src/decoder/plugins/XiphTags.hxx \ + src/decoder/plugins/OggCodec.cxx src/decoder/plugins/OggCodec.hxx endif if ENABLE_VORBIS_DECODER -libdecoder_plugins_a_SOURCES += \ - src/decoder/VorbisDomain.cxx src/decoder/VorbisDomain.hxx \ - src/decoder/VorbisComments.cxx src/decoder/VorbisComments.hxx \ - src/decoder/VorbisDecoderPlugin.cxx src/decoder/VorbisDecoderPlugin.h +libdecoder_a_SOURCES += \ + src/decoder/plugins/VorbisDomain.cxx src/decoder/plugins/VorbisDomain.hxx \ + src/decoder/plugins/VorbisComments.cxx src/decoder/plugins/VorbisComments.hxx \ + src/decoder/plugins/VorbisDecoderPlugin.cxx src/decoder/plugins/VorbisDecoderPlugin.h endif if HAVE_FLAC -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/FlacPcm.cxx src/decoder/FlacPcm.hxx \ - src/decoder/FlacDomain.cxx src/decoder/FlacDomain.hxx \ - src/decoder/FlacCommon.cxx src/decoder/FlacCommon.hxx \ - src/decoder/FlacDecoderPlugin.cxx \ - src/decoder/FlacDecoderPlugin.h +libdecoder_a_SOURCES += \ + src/decoder/plugins/FlacInput.cxx src/decoder/plugins/FlacInput.hxx \ + src/decoder/plugins/FlacIOHandle.cxx src/decoder/plugins/FlacIOHandle.hxx \ + src/decoder/plugins/FlacMetadata.cxx src/decoder/plugins/FlacMetadata.hxx \ + src/decoder/plugins/FlacPcm.cxx src/decoder/plugins/FlacPcm.hxx \ + src/decoder/plugins/FlacDomain.cxx src/decoder/plugins/FlacDomain.hxx \ + src/decoder/plugins/FlacCommon.cxx src/decoder/plugins/FlacCommon.hxx \ + src/decoder/plugins/FlacDecoderPlugin.cxx \ + src/decoder/plugins/FlacDecoderPlugin.h endif if HAVE_AUDIOFILE -libdecoder_plugins_a_SOURCES += \ - src/decoder/AudiofileDecoderPlugin.cxx \ - src/decoder/AudiofileDecoderPlugin.hxx +libdecoder_a_SOURCES += \ + src/decoder/plugins/AudiofileDecoderPlugin.cxx \ + src/decoder/plugins/AudiofileDecoderPlugin.hxx endif if ENABLE_MIKMOD_DECODER -libdecoder_plugins_a_SOURCES += \ - src/decoder/MikmodDecoderPlugin.cxx \ - src/decoder/MikmodDecoderPlugin.hxx +libdecoder_a_SOURCES += \ + src/decoder/plugins/MikmodDecoderPlugin.cxx \ + src/decoder/plugins/MikmodDecoderPlugin.hxx endif if HAVE_MODPLUG libmodplug_decoder_plugin_a_SOURCES = \ - src/decoder/ModplugDecoderPlugin.cxx \ - src/decoder/ModplugDecoderPlugin.hxx + src/decoder/plugins/ModplugDecoderPlugin.cxx \ + src/decoder/plugins/ModplugDecoderPlugin.hxx libmodplug_decoder_plugin_a_CXXFLAGS = $(AM_CXXFLAGS) $(MODPLUG_CFLAGS) -libmodplug_decoder_plugin_a_CPPFLAGS = $(src_mpd_CPPFLAGS) +libmodplug_decoder_plugin_a_CPPFLAGS = $(AM_CPPFLAGS) noinst_LIBRARIES += libmodplug_decoder_plugin.a DECODER_LIBS += libmodplug_decoder_plugin.a $(MODPLUG_LIBS) endif if ENABLE_SIDPLAY -libdecoder_plugins_a_SOURCES += \ - src/decoder/SidplayDecoderPlugin.cxx \ - src/decoder/SidplayDecoderPlugin.hxx +libdecoder_a_SOURCES += \ + src/decoder/plugins/SidplayDecoderPlugin.cxx \ + src/decoder/plugins/SidplayDecoderPlugin.hxx endif if ENABLE_FLUIDSYNTH -libdecoder_plugins_a_SOURCES += \ - src/decoder/FluidsynthDecoderPlugin.cxx \ - src/decoder/FluidsynthDecoderPlugin.hxx +libdecoder_a_SOURCES += \ + src/decoder/plugins/FluidsynthDecoderPlugin.cxx \ + src/decoder/plugins/FluidsynthDecoderPlugin.hxx endif if ENABLE_WILDMIDI -libdecoder_plugins_a_SOURCES += \ - src/decoder/WildmidiDecoderPlugin.cxx \ - src/decoder/WildmidiDecoderPlugin.hxx +libdecoder_a_SOURCES += \ + src/decoder/plugins/WildmidiDecoderPlugin.cxx \ + src/decoder/plugins/WildmidiDecoderPlugin.hxx endif if HAVE_FFMPEG -libdecoder_plugins_a_SOURCES += \ - src/decoder/FfmpegMetaData.cxx \ - src/decoder/FfmpegMetaData.hxx \ - src/decoder/FfmpegDecoderPlugin.cxx \ - src/decoder/FfmpegDecoderPlugin.hxx +libdecoder_a_SOURCES += \ + src/decoder/plugins/FfmpegMetaData.cxx \ + src/decoder/plugins/FfmpegMetaData.hxx \ + src/decoder/plugins/FfmpegDecoderPlugin.cxx \ + src/decoder/plugins/FfmpegDecoderPlugin.hxx endif if ENABLE_SNDFILE -libdecoder_plugins_a_SOURCES += \ - src/decoder/SndfileDecoderPlugin.cxx \ - src/decoder/SndfileDecoderPlugin.hxx +libdecoder_a_SOURCES += \ + src/decoder/plugins/SndfileDecoderPlugin.cxx \ + src/decoder/plugins/SndfileDecoderPlugin.hxx endif if HAVE_GME -libdecoder_plugins_a_SOURCES += \ - src/decoder/GmeDecoderPlugin.cxx src/decoder/GmeDecoderPlugin.hxx +libdecoder_a_SOURCES += \ + src/decoder/plugins/GmeDecoderPlugin.cxx src/decoder/plugins/GmeDecoderPlugin.hxx endif # encoder plugins @@ -670,6 +924,7 @@ libencoder_plugins_a_CPPFLAGS = $(AM_CPPFLAGS) \ $(TWOLAME_CFLAGS) \ $(patsubst -I%/FLAC,-I%,$(FLAC_CFLAGS)) \ $(OPUS_CFLAGS) \ + $(SHINE_CFLAGS) \ $(VORBISENC_CFLAGS) ENCODER_LIBS = \ @@ -678,54 +933,64 @@ ENCODER_LIBS = \ $(TWOLAME_LIBS) \ $(FLAC_LIBS) \ $(OPUS_LIBS) \ + $(SHINE_LIBS) \ $(VORBISENC_LIBS) libencoder_plugins_a_SOURCES = \ - src/EncoderAPI.hxx \ - src/EncoderPlugin.hxx \ - src/encoder/OggStream.hxx \ - src/encoder/NullEncoderPlugin.cxx src/encoder/NullEncoderPlugin.hxx \ - src/EncoderList.cxx src/EncoderList.hxx + src/encoder/EncoderAPI.hxx \ + src/encoder/EncoderPlugin.hxx \ + src/encoder/plugins/OggStream.hxx \ + src/encoder/plugins/NullEncoderPlugin.cxx \ + src/encoder/plugins/NullEncoderPlugin.hxx \ + src/encoder/EncoderList.cxx src/encoder/EncoderList.hxx if HAVE_OGG_ENCODER libencoder_plugins_a_SOURCES += \ - src/encoder/OggSerial.cxx src/encoder/OggSerial.hxx \ - src/encoder/OggStream.hxx + src/encoder/plugins/OggSerial.cxx \ + src/encoder/plugins/OggSerial.hxx \ + src/encoder/plugins/OggStream.hxx endif if ENABLE_WAVE_ENCODER libencoder_plugins_a_SOURCES += \ - src/encoder/WaveEncoderPlugin.cxx \ - src/encoder/WaveEncoderPlugin.hxx + src/encoder/plugins/WaveEncoderPlugin.cxx \ + src/encoder/plugins/WaveEncoderPlugin.hxx endif if ENABLE_VORBIS_ENCODER libencoder_plugins_a_SOURCES += \ - src/encoder/VorbisEncoderPlugin.cxx \ - src/encoder/VorbisEncoderPlugin.hxx + src/encoder/plugins/VorbisEncoderPlugin.cxx \ + src/encoder/plugins/VorbisEncoderPlugin.hxx endif if HAVE_OPUS libencoder_plugins_a_SOURCES += \ - src/encoder/OpusEncoderPlugin.cxx \ - src/encoder/OpusEncoderPlugin.hxx + src/encoder/plugins/OpusEncoderPlugin.cxx \ + src/encoder/plugins/OpusEncoderPlugin.hxx endif if ENABLE_LAME_ENCODER libencoder_plugins_a_SOURCES += \ - src/encoder/LameEncoderPlugin.cxx \ - src/encoder/LameEncoderPlugin.hxx + src/encoder/plugins/LameEncoderPlugin.cxx \ + src/encoder/plugins/LameEncoderPlugin.hxx endif if ENABLE_TWOLAME_ENCODER libencoder_plugins_a_SOURCES += \ - src/encoder/TwolameEncoderPlugin.cxx \ - src/encoder/TwolameEncoderPlugin.hxx + src/encoder/plugins/TwolameEncoderPlugin.cxx \ + src/encoder/plugins/TwolameEncoderPlugin.hxx endif if ENABLE_FLAC_ENCODER libencoder_plugins_a_SOURCES += \ - src/encoder/FlacEncoderPlugin.cxx src/encoder/FlacEncoderPlugin.hxx + src/encoder/plugins/FlacEncoderPlugin.cxx \ + src/encoder/plugins/FlacEncoderPlugin.hxx +endif + +if ENABLE_SHINE_ENCODER +libencoder_plugins_a_SOURCES += \ + src/encoder/plugins/ShineEncoderPlugin.cxx \ + src/encoder/plugins/ShineEncoderPlugin.hxx endif else @@ -734,18 +999,18 @@ endif if HAVE_ZEROCONF -src_mpd_SOURCES += \ - src/ZeroconfInternal.hxx \ - src/ZeroconfGlue.cxx src/ZeroconfGlue.hxx +libmpd_a_SOURCES += \ + src/zeroconf/ZeroconfInternal.hxx \ + src/zeroconf/ZeroconfGlue.cxx src/zeroconf/ZeroconfGlue.hxx if HAVE_AVAHI -src_mpd_SOURCES += \ - src/AvahiPoll.cxx src/AvahiPoll.hxx \ - src/ZeroconfAvahi.cxx src/ZeroconfAvahi.hxx +libmpd_a_SOURCES += \ + src/zeroconf/AvahiPoll.cxx src/zeroconf/AvahiPoll.hxx \ + src/zeroconf/ZeroconfAvahi.cxx src/zeroconf/ZeroconfAvahi.hxx endif if HAVE_BONJOUR -src_mpd_SOURCES += src/ZeroconfBonjour.cxx src/ZeroconfBonjour.hxx +libmpd_a_SOURCES += src/zeroconf/ZeroconfBonjour.cxx src/zeroconf/ZeroconfBonjour.hxx endif endif @@ -754,15 +1019,19 @@ endif # libinput_a_SOURCES = \ - src/InputInit.cxx src/InputInit.hxx \ - src/InputRegistry.cxx src/InputRegistry.hxx \ - src/InputStream.cxx src/InputStream.hxx \ - src/InputPlugin.hxx \ - src/input/RewindInputPlugin.cxx src/input/RewindInputPlugin.hxx \ - src/input/FileInputPlugin.cxx src/input/FileInputPlugin.hxx + src/input/Init.cxx src/input/Init.hxx \ + src/input/Registry.cxx src/input/Registry.hxx \ + src/input/InputStream.cxx src/input/InputStream.hxx \ + src/input/InputPlugin.hxx \ + src/input/TextInputStream.cxx src/input/TextInputStream.hxx \ + src/input/ThreadInputStream.cxx src/input/ThreadInputStream.hxx \ + src/input/plugins/RewindInputPlugin.cxx src/input/plugins/RewindInputPlugin.hxx \ + src/input/plugins/FileInputPlugin.cxx src/input/plugins/FileInputPlugin.hxx libinput_a_CPPFLAGS = $(AM_CPPFLAGS) \ $(CURL_CFLAGS) \ + $(SMBCLIENT_CFLAGS) \ + $(NFS_CFLAGS) \ $(CDIO_PARANOIA_CFLAGS) \ $(FFMPEG_CFLAGS) \ $(DESPOTIFY_CFLAGS) \ @@ -771,37 +1040,61 @@ libinput_a_CPPFLAGS = $(AM_CPPFLAGS) \ INPUT_LIBS = \ libinput.a \ $(CURL_LIBS) \ + $(SMBCLIENT_LIBS) \ + $(NFS_LIBS) \ $(CDIO_PARANOIA_LIBS) \ $(FFMPEG_LIBS) \ $(DESPOTIFY_LIBS) \ $(MMS_LIBS) +if HAVE_ALSA +libinput_a_SOURCES += \ + src/input/plugins/AlsaInputPlugin.cxx \ + src/input/plugins/AlsaInputPlugin.hxx +INPUT_LIBS += $(ALSA_LIBS) +endif + + if ENABLE_CURL libinput_a_SOURCES += \ - src/input/CurlInputPlugin.cxx src/input/CurlInputPlugin.hxx \ + src/input/plugins/CurlInputPlugin.cxx src/input/plugins/CurlInputPlugin.hxx \ src/IcyMetaDataParser.cxx src/IcyMetaDataParser.hxx endif +if ENABLE_SMBCLIENT +libinput_a_SOURCES += \ + $(SMBCLIENT_SOURCES) \ + src/input/plugins/SmbclientInputPlugin.cxx src/input/plugins/SmbclientInputPlugin.hxx +endif + +if ENABLE_NFS +libinput_a_SOURCES += \ + src/lib/nfs/Domain.cxx src/lib/nfs/Domain.hxx \ + src/input/plugins/NfsInputPlugin.cxx src/input/plugins/NfsInputPlugin.hxx +endif + if ENABLE_CDIO_PARANOIA libinput_a_SOURCES += \ - src/input/CdioParanoiaInputPlugin.cxx \ - src/input/CdioParanoiaInputPlugin.hxx + src/input/plugins/CdioParanoiaInputPlugin.cxx \ + src/input/plugins/CdioParanoiaInputPlugin.hxx endif if HAVE_FFMPEG libinput_a_SOURCES += \ - src/input/FfmpegInputPlugin.cxx src/input/FfmpegInputPlugin.hxx + src/input/plugins/FfmpegInputPlugin.cxx src/input/plugins/FfmpegInputPlugin.hxx endif if ENABLE_MMS libinput_a_SOURCES += \ - src/input/MmsInputPlugin.cxx src/input/MmsInputPlugin.hxx + src/input/plugins/MmsInputPlugin.cxx src/input/plugins/MmsInputPlugin.hxx endif if ENABLE_DESPOTIFY libinput_a_SOURCES += \ - src/input/DespotifyInputPlugin.cxx \ - src/input/DespotifyInputPlugin.hxx + src/lib/despotify/DespotifyUtils.cxx \ + src/lib/despotify/DespotifyUtils.hxx \ + src/input/plugins/DespotifyInputPlugin.cxx \ + src/input/plugins/DespotifyInputPlugin.hxx endif @@ -826,128 +1119,155 @@ OUTPUT_LIBS = \ $(SHOUT_LIBS) OUTPUT_API_SRC = \ - src/OutputAPI.hxx \ - src/OutputInternal.hxx \ - src/OutputList.cxx src/OutputList.hxx \ - src/OutputAll.cxx src/OutputAll.hxx \ - src/OutputThread.cxx src/OutputThread.hxx \ - src/OutputError.cxx 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/OutputPlugin.hxx \ - src/OutputFinish.cxx \ - src/OutputInit.cxx + src/output/OutputAPI.hxx \ + src/output/Internal.hxx \ + src/output/Registry.cxx src/output/Registry.hxx \ + src/output/MultipleOutputs.cxx src/output/MultipleOutputs.hxx \ + src/output/OutputThread.cxx \ + src/output/Domain.cxx src/output/Domain.hxx \ + src/output/OutputControl.cxx \ + src/output/OutputState.cxx src/output/OutputState.hxx \ + src/output/OutputPrint.cxx src/output/OutputPrint.hxx \ + src/output/OutputCommand.cxx src/output/OutputCommand.hxx \ + src/output/OutputPlugin.cxx src/output/OutputPlugin.hxx \ + src/output/Finish.cxx \ + src/output/Init.cxx liboutput_plugins_a_SOURCES = \ - src/output/NullOutputPlugin.cxx \ - src/output/NullOutputPlugin.hxx + src/output/Timer.cxx src/output/Timer.hxx \ + src/output/plugins/NullOutputPlugin.cxx \ + src/output/plugins/NullOutputPlugin.hxx MIXER_LIBS = \ libmixer_plugins.a \ $(PULSE_LIBS) MIXER_API_SRC = \ - src/MixerPlugin.hxx \ - src/MixerList.hxx \ - src/MixerControl.cxx src/MixerControl.hxx \ - src/MixerType.cxx src/MixerType.hxx \ - src/MixerAll.cxx src/MixerAll.hxx \ - src/MixerInternal.hxx + src/mixer/Listener.hxx \ + src/mixer/MixerPlugin.hxx \ + src/mixer/MixerList.hxx \ + src/mixer/MixerControl.cxx src/mixer/MixerControl.hxx \ + src/mixer/MixerType.cxx src/mixer/MixerType.hxx \ + src/mixer/MixerAll.cxx \ + src/mixer/MixerInternal.hxx libmixer_plugins_a_SOURCES = \ - src/mixer/SoftwareMixerPlugin.cxx \ - src/mixer/SoftwareMixerPlugin.hxx + src/mixer/plugins/SoftwareMixerPlugin.cxx \ + src/mixer/plugins/SoftwareMixerPlugin.hxx libmixer_plugins_a_CPPFLAGS = $(AM_CPPFLAGS) \ $(ALSA_CFLAGS) \ $(PULSE_CFLAGS) if HAVE_ALSA liboutput_plugins_a_SOURCES += \ - src/output/AlsaOutputPlugin.cxx \ - src/output/AlsaOutputPlugin.hxx -libmixer_plugins_a_SOURCES += src/mixer/AlsaMixerPlugin.cxx + src/output/plugins/AlsaOutputPlugin.cxx \ + src/output/plugins/AlsaOutputPlugin.hxx +libmixer_plugins_a_SOURCES += src/mixer/plugins/AlsaMixerPlugin.cxx +endif + +if ANDROID +liboutput_plugins_a_SOURCES += \ + src/output/plugins/sles/Object.hxx \ + src/output/plugins/sles/Engine.hxx \ + src/output/plugins/sles/Play.hxx \ + src/output/plugins/sles/AndroidSimpleBufferQueue.hxx \ + src/output/plugins/sles/SlesOutputPlugin.cxx \ + src/output/plugins/sles/SlesOutputPlugin.hxx +OUTPUT_LIBS += -lOpenSLES endif if HAVE_ROAR liboutput_plugins_a_SOURCES += \ - src/output/RoarOutputPlugin.cxx src/output/RoarOutputPlugin.hxx -libmixer_plugins_a_SOURCES += src/mixer/RoarMixerPlugin.cxx + src/output/plugins/RoarOutputPlugin.cxx \ + src/output/plugins/RoarOutputPlugin.hxx +libmixer_plugins_a_SOURCES += src/mixer/plugins/RoarMixerPlugin.cxx endif if HAVE_AO liboutput_plugins_a_SOURCES += \ - src/output/AoOutputPlugin.cxx src/output/AoOutputPlugin.hxx + src/output/plugins/AoOutputPlugin.cxx \ + src/output/plugins/AoOutputPlugin.hxx endif if HAVE_FIFO liboutput_plugins_a_SOURCES += \ - src/output/FifoOutputPlugin.cxx src/output/FifoOutputPlugin.hxx + src/output/plugins/FifoOutputPlugin.cxx \ + src/output/plugins/FifoOutputPlugin.hxx endif if ENABLE_PIPE_OUTPUT liboutput_plugins_a_SOURCES += \ - src/output/PipeOutputPlugin.cxx src/output/PipeOutputPlugin.hxx + src/output/plugins/PipeOutputPlugin.cxx \ + src/output/plugins/PipeOutputPlugin.hxx endif if HAVE_JACK liboutput_plugins_a_SOURCES += \ - src/output/JackOutputPlugin.cxx src/output/JackOutputPlugin.hxx + src/output/plugins/JackOutputPlugin.cxx \ + src/output/plugins/JackOutputPlugin.hxx endif if HAVE_OSS liboutput_plugins_a_SOURCES += \ - src/output/OssOutputPlugin.cxx \ - src/output/OssOutputPlugin.hxx -libmixer_plugins_a_SOURCES += src/mixer/OssMixerPlugin.cxx + src/output/plugins/OssOutputPlugin.cxx \ + src/output/plugins/OssOutputPlugin.hxx +libmixer_plugins_a_SOURCES += src/mixer/plugins/OssMixerPlugin.cxx endif if HAVE_OPENAL liboutput_plugins_a_SOURCES += \ - src/output/OpenALOutputPlugin.cxx src/output/OpenALOutputPlugin.hxx + src/output/plugins/OpenALOutputPlugin.cxx \ + src/output/plugins/OpenALOutputPlugin.hxx endif if HAVE_OSX liboutput_plugins_a_SOURCES += \ - src/output/OSXOutputPlugin.cxx \ - src/output/OSXOutputPlugin.hxx + src/output/plugins/OSXOutputPlugin.cxx \ + src/output/plugins/OSXOutputPlugin.hxx endif if HAVE_PULSE liboutput_plugins_a_SOURCES += \ - src/output/PulseOutputPlugin.cxx src/output/PulseOutputPlugin.hxx + src/output/plugins/PulseOutputPlugin.cxx \ + src/output/plugins/PulseOutputPlugin.hxx libmixer_plugins_a_SOURCES += \ - src/mixer/PulseMixerPlugin.cxx src/mixer/PulseMixerPlugin.hxx + src/mixer/plugins/PulseMixerPlugin.cxx src/mixer/plugins/PulseMixerPlugin.hxx endif if HAVE_SHOUT liboutput_plugins_a_SOURCES += \ - src/output/ShoutOutputPlugin.cxx src/output/ShoutOutputPlugin.hxx + src/output/plugins/ShoutOutputPlugin.cxx \ + src/output/plugins/ShoutOutputPlugin.hxx endif if ENABLE_RECORDER_OUTPUT liboutput_plugins_a_SOURCES += \ - src/output/RecorderOutputPlugin.cxx src/output/RecorderOutputPlugin.hxx + src/output/plugins/RecorderOutputPlugin.cxx \ + src/output/plugins/RecorderOutputPlugin.hxx endif if ENABLE_HTTPD_OUTPUT liboutput_plugins_a_SOURCES += \ - src/IcyMetaDataServer.cxx src/IcyMetaDataServer.hxx \ - src/output/HttpdInternal.hxx \ - src/output/HttpdClient.cxx src/output/HttpdClient.hxx \ - src/output/HttpdOutputPlugin.cxx src/output/HttpdOutputPlugin.hxx + src/output/plugins/httpd/IcyMetaDataServer.cxx \ + src/output/plugins/httpd/IcyMetaDataServer.hxx \ + src/output/plugins/httpd/Page.cxx src/output/plugins/httpd/Page.hxx \ + src/output/plugins/httpd/HttpdInternal.hxx \ + src/output/plugins/httpd/HttpdClient.cxx \ + src/output/plugins/httpd/HttpdClient.hxx \ + src/output/plugins/httpd/HttpdOutputPlugin.cxx \ + src/output/plugins/httpd/HttpdOutputPlugin.hxx endif if ENABLE_SOLARIS_OUTPUT liboutput_plugins_a_SOURCES += \ - src/output/SolarisOutputPlugin.cxx src/output/SolarisOutputPlugin.hxx + src/output/plugins/SolarisOutputPlugin.cxx src/output/plugins/SolarisOutputPlugin.hxx endif if ENABLE_WINMM_OUTPUT liboutput_plugins_a_SOURCES += \ - src/output/WinmmOutputPlugin.cxx src/output/WinmmOutputPlugin.hxx -libmixer_plugins_a_SOURCES += src/mixer/WinmmMixerPlugin.cxx + src/output/plugins/WinmmOutputPlugin.cxx \ + src/output/plugins/WinmmOutputPlugin.hxx +libmixer_plugins_a_SOURCES += src/mixer/plugins/WinmmMixerPlugin.cxx endif @@ -956,65 +1276,85 @@ endif # libplaylist_plugins_a_SOURCES = \ - src/PlaylistPlugin.hxx \ - src/SongEnumerator.hxx \ - src/MemorySongEnumerator.cxx src/MemorySongEnumerator.hxx \ - src/playlist/ExtM3uPlaylistPlugin.cxx \ - src/playlist/ExtM3uPlaylistPlugin.hxx \ - src/playlist/M3uPlaylistPlugin.cxx \ - src/playlist/M3uPlaylistPlugin.hxx \ - src/playlist/PlsPlaylistPlugin.cxx \ - src/playlist/PlsPlaylistPlugin.hxx \ - src/playlist/XspfPlaylistPlugin.cxx \ - src/playlist/XspfPlaylistPlugin.hxx \ - src/playlist/AsxPlaylistPlugin.cxx \ - src/playlist/AsxPlaylistPlugin.hxx \ - src/playlist/RssPlaylistPlugin.cxx \ - src/playlist/RssPlaylistPlugin.hxx \ - src/playlist/CuePlaylistPlugin.cxx \ - src/playlist/CuePlaylistPlugin.hxx \ - src/playlist/EmbeddedCuePlaylistPlugin.cxx \ - src/playlist/EmbeddedCuePlaylistPlugin.hxx \ - src/PlaylistRegistry.cxx src/PlaylistRegistry.hxx + src/playlist/PlaylistPlugin.hxx \ + src/playlist/SongEnumerator.hxx \ + src/playlist/CloseSongEnumerator.cxx \ + src/playlist/CloseSongEnumerator.hxx \ + src/playlist/MemorySongEnumerator.cxx \ + src/playlist/MemorySongEnumerator.hxx \ + src/playlist/cue/CueParser.cxx src/playlist/cue/CueParser.hxx \ + src/playlist/plugins/ExtM3uPlaylistPlugin.cxx \ + src/playlist/plugins/ExtM3uPlaylistPlugin.hxx \ + src/playlist/plugins/M3uPlaylistPlugin.cxx \ + src/playlist/plugins/M3uPlaylistPlugin.hxx \ + src/playlist/plugins/CuePlaylistPlugin.cxx \ + src/playlist/plugins/CuePlaylistPlugin.hxx \ + src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx \ + src/playlist/plugins/EmbeddedCuePlaylistPlugin.hxx \ + src/playlist/PlaylistRegistry.cxx src/playlist/PlaylistRegistry.hxx libplaylist_plugins_a_CPPFLAGS = $(AM_CPPFLAGS) \ + $(EXPAT_CFLAGS) \ $(YAJL_CFLAGS) \ $(patsubst -I%/FLAC,-I%,$(FLAC_CFLAGS)) PLAYLIST_LIBS = \ libplaylist_plugins.a \ + $(EXPAT_LIBS) \ $(FLAC_LIBS) if ENABLE_DESPOTIFY libplaylist_plugins_a_SOURCES += \ - src/playlist/DespotifyPlaylistPlugin.cxx \ - src/playlist/DespotifyPlaylistPlugin.hxx + src/lib/despotify/DespotifyUtils.cxx \ + src/lib/despotify/DespotifyUtils.hxx \ + src/playlist/plugins/DespotifyPlaylistPlugin.cxx \ + src/playlist/plugins/DespotifyPlaylistPlugin.hxx endif if ENABLE_SOUNDCLOUD libplaylist_plugins_a_SOURCES += \ - src/playlist/SoundCloudPlaylistPlugin.cxx \ - src/playlist/SoundCloudPlaylistPlugin.hxx + src/playlist/plugins/SoundCloudPlaylistPlugin.cxx \ + src/playlist/plugins/SoundCloudPlaylistPlugin.hxx PLAYLIST_LIBS += $(YAJL_LIBS) endif +if HAVE_EXPAT +libplaylist_plugins_a_SOURCES += \ + src/lib/expat/ExpatParser.cxx src/lib/expat/ExpatParser.hxx \ + src/playlist/plugins/XspfPlaylistPlugin.cxx \ + src/playlist/plugins/XspfPlaylistPlugin.hxx \ + src/playlist/plugins/AsxPlaylistPlugin.cxx \ + src/playlist/plugins/AsxPlaylistPlugin.hxx \ + src/playlist/plugins/RssPlaylistPlugin.cxx \ + src/playlist/plugins/RssPlaylistPlugin.hxx +endif + +if HAVE_GLIB +libplaylist_plugins_a_SOURCES += \ + src/playlist/plugins/PlsPlaylistPlugin.cxx \ + src/playlist/plugins/PlsPlaylistPlugin.hxx +endif + # # Filter plugins # libfilter_plugins_a_SOURCES = \ - src/filter/NullFilterPlugin.cxx \ - src/filter/ChainFilterPlugin.cxx \ - src/filter/ChainFilterPlugin.hxx \ - src/filter/AutoConvertFilterPlugin.cxx \ - src/filter/AutoConvertFilterPlugin.hxx \ - src/filter/ConvertFilterPlugin.cxx \ - src/filter/ConvertFilterPlugin.hxx \ - src/filter/RouteFilterPlugin.cxx \ - src/filter/NormalizeFilterPlugin.cxx \ - src/filter/ReplayGainFilterPlugin.cxx \ - src/filter/ReplayGainFilterPlugin.hxx \ - src/filter/VolumeFilterPlugin.cxx \ - src/filter/VolumeFilterPlugin.hxx + src/AudioCompress/config.h \ + src/AudioCompress/compress.h \ + src/AudioCompress/compress.c \ + src/filter/plugins/NullFilterPlugin.cxx \ + src/filter/plugins/ChainFilterPlugin.cxx \ + src/filter/plugins/ChainFilterPlugin.hxx \ + src/filter/plugins/AutoConvertFilterPlugin.cxx \ + src/filter/plugins/AutoConvertFilterPlugin.hxx \ + src/filter/plugins/ConvertFilterPlugin.cxx \ + src/filter/plugins/ConvertFilterPlugin.hxx \ + src/filter/plugins/RouteFilterPlugin.cxx \ + src/filter/plugins/NormalizeFilterPlugin.cxx \ + src/filter/plugins/ReplayGainFilterPlugin.cxx \ + src/filter/plugins/ReplayGainFilterPlugin.hxx \ + src/filter/plugins/VolumeFilterPlugin.cxx \ + src/filter/plugins/VolumeFilterPlugin.hxx FILTER_LIBS = \ libfilter_plugins.a \ @@ -1027,29 +1367,10 @@ FILTER_LIBS = \ if HAVE_SYSTEMD systemdsystemunit_DATA = \ - mpd.service + systemd/mpd.socket \ + systemd/mpd.service endif -# -# Sparse code analysis -# -# sparse is a semantic parser -# URL: git://www.kernel.org/pub/scm/devel/sparse/sparse.git -# - -SPARSE = sparse -SPARSE_FLAGS = -SPARSE_CPPFLAGS = $(DEFAULT_INCLUDES) \ - -I$(shell $(CC) -print-file-name=include) \ - -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) $(SPARSE_SRC) - -.PHONY: sparse-check - # # Test programs @@ -1061,10 +1382,17 @@ C_TESTS = \ test/test_util \ test/test_byte_reverse \ test/test_mixramp \ - test/test_icy_parser \ test/test_pcm \ test/test_queue_priority +if ENABLE_CURL +C_TESTS += test/test_icy_parser +endif + +if ENABLE_DATABASE +C_TESTS += test/test_translate_song +endif + if ENABLE_ARCHIVE C_TESTS += test/test_archive endif @@ -1075,7 +1403,6 @@ noinst_PROGRAMS = \ $(C_TESTS) \ test/read_conf \ test/run_resolver \ - test/DumpDatabase \ test/run_input \ test/dump_text_file \ test/dump_playlist \ @@ -1087,6 +1414,14 @@ noinst_PROGRAMS = \ test/run_normalize \ test/software_volume +if ENABLE_DATABASE +noinst_PROGRAMS += test/DumpDatabase +endif + +if ENABLE_NEIGHBOR_PLUGINS +noinst_PROGRAMS += test/run_neighbor_explorer +endif + if HAVE_AVAHI noinst_PROGRAMS += test/run_avahi endif @@ -1106,12 +1441,12 @@ endif test_read_conf_LDADD = \ libconf.a \ - libutil.a \ libsystem.a \ libfs.a \ + libutil.a \ $(GLIB_LIBS) test_read_conf_SOURCES = \ - src/Log.cxx \ + src/Log.cxx src/LogBackend.cxx \ test/read_conf.cxx test_run_resolver_LDADD = \ @@ -1119,30 +1454,39 @@ test_run_resolver_LDADD = \ libutil.a \ $(GLIB_LIBS) test_run_resolver_SOURCES = \ - src/Log.cxx \ + src/Log.cxx src/LogBackend.cxx \ test/run_resolver.cxx +if ENABLE_DATABASE + test_DumpDatabase_LDADD = \ $(DB_LIBS) \ $(TAG_LIBS) \ libconf.a \ libutil.a \ + libevent.a \ libsystem.a \ libfs.a \ + $(ICU_LDADD) \ $(GLIB_LIBS) test_DumpDatabase_SOURCES = test/DumpDatabase.cxx \ src/protocol/Ack.cxx \ - src/Log.cxx \ - src/DatabaseError.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/SongSave.cxx src/SongSort.cxx \ + src/Log.cxx src/LogBackend.cxx \ + src/db/DatabaseError.cxx \ + src/db/Registry.cxx \ + src/db/Selection.cxx \ + src/db/PlaylistVector.cxx \ + src/db/DatabaseLock.cxx \ + src/SongSave.cxx \ + src/DetachedSong.cxx \ src/TagSave.cxx \ - src/SongFilter.cxx \ - src/TextFile.cxx + src/SongFilter.cxx + +if HAVE_LIBUPNP +test_DumpDatabase_SOURCES += src/lib/expat/ExpatParser.cxx +endif + +endif test_run_input_LDADD = \ $(INPUT_LIBS) \ @@ -1157,10 +1501,41 @@ test_run_input_LDADD = \ $(GLIB_LIBS) test_run_input_SOURCES = test/run_input.cxx \ test/stdbin.h \ - src/Log.cxx \ + src/Log.cxx src/LogBackend.cxx \ src/IOThread.cxx \ src/TagSave.cxx +if ENABLE_NEIGHBOR_PLUGINS + +test_run_neighbor_explorer_SOURCES = \ + src/Log.cxx src/LogBackend.cxx \ + src/IOThread.cxx \ + test/run_neighbor_explorer.cxx +test_run_neighbor_explorer_LDADD = $(AM_LDADD) \ + $(GLIB_LIBS) \ + $(NEIGHBOR_LIBS) \ + $(INPUT_LIBS) \ + $(ARCHIVE_LIBS) \ + libtag.a \ + libconf.a \ + libevent.a \ + libfs.a \ + libsystem.a \ + libthread.a \ + libutil.a + +if HAVE_LIBUPNP +test_run_neighbor_explorer_SOURCES += src/lib/expat/ExpatParser.cxx +endif + +if ENABLE_DESPOTIFY +test_run_neighbor_explorer_SOURCES += \ + src/lib/despotify/DespotifyUtils.cxx \ + src/lib/despotify/DespotifyUtils.hxx +endif + +endif + if ENABLE_ARCHIVE test_visit_archive_LDADD = \ @@ -1175,13 +1550,9 @@ test_visit_archive_LDADD = \ libfs.a \ $(GLIB_LIBS) test_visit_archive_SOURCES = test/visit_archive.cxx \ - src/Log.cxx \ + src/Log.cxx src/LogBackend.cxx \ src/IOThread.cxx \ - src/InputStream.cxx - -if ENABLE_DESPOTIFY -test_visit_archive_SOURCES += src/DespotifyUtils.cxx -endif + src/input/InputStream.cxx endif @@ -1198,9 +1569,8 @@ test_dump_text_file_LDADD = \ $(GLIB_LIBS) test_dump_text_file_SOURCES = test/dump_text_file.cxx \ test/stdbin.h \ - src/Log.cxx \ - src/IOThread.cxx \ - src/TextInputStream.cxx + src/Log.cxx src/LogBackend.cxx \ + src/IOThread.cxx test_dump_playlist_LDADD = \ $(PLAYLIST_LIBS) \ @@ -1218,19 +1588,19 @@ test_dump_playlist_LDADD = \ libpcm.a \ $(GLIB_LIBS) test_dump_playlist_SOURCES = test/dump_playlist.cxx \ + test/FakeDecoderAPI.cxx \ $(DECODER_SRC) \ - src/Log.cxx \ + src/Log.cxx src/LogBackend.cxx \ src/IOThread.cxx \ - src/Song.cxx src/TagSave.cxx \ + src/TagSave.cxx \ src/TagFile.cxx \ src/CheckAudioFormat.cxx \ - src/TextInputStream.cxx \ - src/cue/CueParser.cxx src/cue/CueParser.hxx + src/DetachedSong.cxx if HAVE_FLAC test_dump_playlist_SOURCES += \ src/ReplayGainInfo.cxx \ - src/decoder/FlacMetadata.cxx + src/decoder/plugins/FlacMetadata.cxx endif test_run_decoder_LDADD = \ @@ -1248,7 +1618,7 @@ test_run_decoder_LDADD = \ $(GLIB_LIBS) test_run_decoder_SOURCES = test/run_decoder.cxx \ test/stdbin.h \ - src/Log.cxx \ + src/Log.cxx src/LogBackend.cxx \ src/IOThread.cxx \ src/ReplayGainInfo.cxx \ src/AudioFormat.cxx src/CheckAudioFormat.cxx \ @@ -1271,7 +1641,8 @@ test_read_tags_LDADD = \ libutil.a \ $(GLIB_LIBS) test_read_tags_SOURCES = test/read_tags.cxx \ - src/Log.cxx \ + test/FakeDecoderAPI.cxx \ + src/Log.cxx src/LogBackend.cxx \ src/IOThread.cxx \ src/ReplayGainInfo.cxx \ src/CheckAudioFormat.cxx \ @@ -1283,41 +1654,32 @@ test_dump_rva2_LDADD = \ libutil.a \ $(GLIB_LIBS) test_dump_rva2_SOURCES = \ - src/Log.cxx \ + src/Log.cxx src/LogBackend.cxx \ test/dump_rva2.cxx endif test_run_filter_LDADD = \ $(FILTER_LIBS) \ libconf.a \ - libutil.a \ libsystem.a \ libfs.a \ + libutil.a \ $(GLIB_LIBS) test_run_filter_SOURCES = test/run_filter.cxx \ test/FakeReplayGainConfig.cxx \ test/stdbin.h \ - src/Log.cxx \ - src/FilterPlugin.cxx src/FilterRegistry.cxx \ + src/Log.cxx src/LogBackend.cxx \ + src/filter/FilterPlugin.cxx src/filter/FilterRegistry.cxx \ src/CheckAudioFormat.cxx \ src/AudioFormat.cxx \ src/AudioParser.cxx \ - src/ReplayGainInfo.cxx \ - src/AudioCompress/compress.c - -if ENABLE_DESPOTIFY -test_read_tags_SOURCES += src/DespotifyUtils.cxx -test_run_input_SOURCES += src/DespotifyUtils.cxx -test_dump_text_file_SOURCES += src/DespotifyUtils.cxx -test_dump_playlist_SOURCES += src/DespotifyUtils.cxx -test_run_decoder_SOURCES += src/DespotifyUtils.cxx -endif + src/ReplayGainInfo.cxx if ENABLE_ENCODER noinst_PROGRAMS += test/run_encoder test_run_encoder_SOURCES = test/run_encoder.cxx \ test/stdbin.h \ - src/Log.cxx \ + src/Log.cxx src/LogBackend.cxx \ src/CheckAudioFormat.cxx \ src/AudioFormat.cxx \ src/AudioParser.cxx @@ -1337,7 +1699,7 @@ if ENABLE_VORBIS_ENCODER noinst_PROGRAMS += test/test_vorbis_encoder test_test_vorbis_encoder_SOURCES = test/test_vorbis_encoder.cxx \ test/stdbin.h \ - src/Log.cxx \ + src/Log.cxx src/LogBackend.cxx \ src/CheckAudioFormat.cxx \ src/AudioFormat.cxx \ src/AudioParser.cxx \ @@ -1357,7 +1719,8 @@ endif test_software_volume_SOURCES = test/software_volume.cxx \ test/stdbin.h \ - src/CheckAudioFormat.cxx \ + src/Log.cxx src/LogBackend.cxx \ + src/AudioFormat.cxx src/CheckAudioFormat.cxx \ src/AudioParser.cxx test_software_volume_LDADD = \ $(PCM_LIBS) \ @@ -1365,8 +1728,8 @@ test_software_volume_LDADD = \ $(GLIB_LIBS) test_run_avahi_SOURCES = \ - src/Log.cxx \ - src/ZeroconfAvahi.cxx src/AvahiPoll.cxx \ + src/Log.cxx src/LogBackend.cxx \ + src/zeroconf/ZeroconfAvahi.cxx src/zeroconf/AvahiPoll.cxx \ test/ShutdownHandler.cxx test/ShutdownHandler.hxx \ test/run_avahi.cxx test_run_avahi_CPPFLAGS = $(AM_CPPFLAGS) \ @@ -1380,14 +1743,14 @@ test_run_avahi_LDADD = \ test_run_normalize_SOURCES = test/run_normalize.cxx \ test/stdbin.h \ src/CheckAudioFormat.cxx \ - src/AudioParser.cxx \ - src/AudioCompress/compress.c + src/AudioCompress/compress.c \ + src/AudioParser.cxx test_run_normalize_LDADD = \ libutil.a \ $(GLIB_LIBS) test_run_convert_SOURCES = test/run_convert.cxx \ - src/Log.cxx \ + src/Log.cxx src/LogBackend.cxx \ src/AudioFormat.cxx \ src/CheckAudioFormat.cxx \ src/AudioParser.cxx @@ -1413,21 +1776,18 @@ test_run_output_LDADD = $(MPD_LIBS) \ test_run_output_SOURCES = test/run_output.cxx \ test/FakeReplayGainConfig.cxx \ test/stdbin.h \ - src/Log.cxx \ + src/Log.cxx src/LogBackend.cxx \ src/IOThread.cxx \ src/CheckAudioFormat.cxx \ src/AudioFormat.cxx \ src/AudioParser.cxx \ - src/Timer.cxx \ - src/Page.cxx \ - src/OutputError.cxx \ - src/OutputInit.cxx src/OutputFinish.cxx src/OutputList.cxx \ - src/OutputPlugin.cxx \ - src/MixerControl.cxx \ - src/MixerType.cxx \ - src/FilterPlugin.cxx \ - src/FilterConfig.cxx \ - src/AudioCompress/compress.c \ + src/output/Domain.cxx \ + src/output/Init.cxx src/output/Finish.cxx src/output/Registry.cxx \ + src/output/OutputPlugin.cxx \ + src/mixer/MixerControl.cxx \ + src/mixer/MixerType.cxx \ + src/filter/FilterPlugin.cxx \ + src/filter/FilterConfig.cxx \ src/ReplayGainInfo.cxx test_read_mixer_LDADD = \ @@ -1435,16 +1795,17 @@ test_read_mixer_LDADD = \ libmixer_plugins.a \ $(OUTPUT_LIBS) \ libconf.a \ - libutil.a \ libevent.a \ libsystem.a \ libfs.a \ + libutil.a \ $(GLIB_LIBS) test_read_mixer_SOURCES = test/read_mixer.cxx \ - src/Log.cxx \ - src/MixerControl.cxx \ - src/FilterPlugin.cxx \ - src/filter/VolumeFilterPlugin.cxx + src/Log.cxx src/LogBackend.cxx \ + src/mixer/MixerControl.cxx \ + src/filter/FilterPlugin.cxx \ + src/AudioFormat.cxx \ + src/filter/plugins/VolumeFilterPlugin.cxx if ENABLE_BZIP2_TEST TESTS += test/test_archive_bzip2.sh @@ -1462,9 +1823,9 @@ if ENABLE_INOTIFY noinst_PROGRAMS += test/run_inotify test_run_inotify_SOURCES = test/run_inotify.cxx \ test/ShutdownHandler.cxx test/ShutdownHandler.hxx \ - src/Log.cxx \ - src/InotifyDomain.cxx \ - src/InotifySource.cxx + src/Log.cxx src/LogBackend.cxx \ + src/db/update/InotifyDomain.cxx \ + src/db/update/InotifySource.cxx test_run_inotify_LDADD = \ libevent.a \ libsystem.a \ @@ -1473,6 +1834,7 @@ test_run_inotify_LDADD = \ endif test_test_util_SOURCES = \ + test/TestCircularBuffer.hxx \ test/test_util.cxx test_test_util_CPPFLAGS = $(AM_CPPFLAGS) $(CPPUNIT_CFLAGS) -DCPPUNIT_HAVE_RTTI=0 test_test_util_CXXFLAGS = $(AM_CXXFLAGS) -Wno-error=deprecated-declarations @@ -1489,7 +1851,7 @@ test_test_byte_reverse_LDADD = \ $(CPPUNIT_LIBS) test_test_mixramp_SOURCES = \ - src/Log.cxx \ + src/Log.cxx src/LogBackend.cxx \ test/test_mixramp.cxx test_test_mixramp_CPPFLAGS = $(AM_CPPFLAGS) $(CPPUNIT_CFLAGS) -DCPPUNIT_HAVE_RTTI=0 test_test_mixramp_CXXFLAGS = $(AM_CXXFLAGS) -Wno-error=deprecated-declarations @@ -1497,17 +1859,21 @@ test_test_mixramp_LDADD = \ $(GLIB_LIBS) \ $(CPPUNIT_LIBS) +if ENABLE_CURL test_test_icy_parser_SOURCES = \ - src/Log.cxx \ + src/Log.cxx src/LogBackend.cxx \ test/test_icy_parser.cxx test_test_icy_parser_CPPFLAGS = $(AM_CPPFLAGS) $(CPPUNIT_CFLAGS) -DCPPUNIT_HAVE_RTTI=0 test_test_icy_parser_CXXFLAGS = $(AM_CXXFLAGS) -Wno-error=deprecated-declarations test_test_icy_parser_LDADD = \ libtag.a \ + libutil.a \ $(GLIB_LIBS) \ $(CPPUNIT_LIBS) +endif test_test_pcm_SOURCES = \ + src/AudioFormat.cxx \ test/test_pcm_util.hxx \ test/test_pcm_dither.cxx \ test/test_pcm_pack.cxx \ @@ -1526,7 +1892,7 @@ test_test_pcm_LDADD = \ $(GLIB_LIBS) test_test_archive_SOURCES = \ - src/Log.cxx \ + src/Log.cxx src/LogBackend.cxx \ test/test_archive.cxx test_test_archive_CPPFLAGS = $(AM_CPPFLAGS) $(CPPUNIT_CFLAGS) -DCPPUNIT_HAVE_RTTI=0 test_test_archive_CXXFLAGS = $(AM_CXXFLAGS) -Wno-error=deprecated-declarations @@ -1535,8 +1901,31 @@ test_test_archive_LDADD = \ $(GLIB_LIBS) \ $(CPPUNIT_LIBS) +if ENABLE_DATABASE + +test_test_translate_song_SOURCES = \ + src/playlist/PlaylistSong.cxx \ + src/PlaylistError.cxx \ + src/DetachedSong.cxx \ + src/SongLoader.cxx \ + src/Log.cxx \ + test/test_translate_song.cxx +test_test_translate_song_CPPFLAGS = $(AM_CPPFLAGS) $(CPPUNIT_CFLAGS) -DCPPUNIT_HAVE_RTTI=0 +test_test_translate_song_CXXFLAGS = $(AM_CXXFLAGS) -Wno-error=deprecated-declarations +test_test_translate_song_LDADD = \ + $(STORAGE_LIBS) \ + libtag.a \ + libfs.a \ + libsystem.a \ + libutil.a \ + $(GLIB_LIBS) \ + $(CPPUNIT_LIBS) + +endif + test_test_queue_priority_SOURCES = \ - src/Queue.cxx \ + src/queue/Queue.cxx \ + src/DetachedSong.cxx \ test/test_queue_priority.cxx test_test_queue_priority_CPPFLAGS = $(AM_CPPFLAGS) $(CPPUNIT_CFLAGS) -DCPPUNIT_HAVE_RTTI=0 test_test_queue_priority_CXXFLAGS = $(AM_CXXFLAGS) -Wno-error=deprecated-declarations @@ -1563,7 +1952,7 @@ endif # man_MANS = doc/mpd.1 doc/mpd.conf.5 -doc_DATA = AUTHORS COPYING NEWS README UPGRADING doc/mpdconf.example +doc_DATA = AUTHORS COPYING NEWS README doc/mpdconf.example DOCBOOK_FILES = doc/protocol.xml doc/user.xml doc/developer.xml @@ -1591,7 +1980,7 @@ DOCBOOK_HTML = endif doc/api/html/index.html: doc/doxygen.conf - @mkdir -p $(@D) + @$(MKDIR_P) $(@D) $(DOXYGEN) $< all-local: $(DOCBOOK_HTML) doc/api/html/index.html @@ -1630,4 +2019,4 @@ EXTRA_DIST = $(doc_DATA) autogen.sh \ test/test_archive_zzip.sh \ $(wildcard scripts/*.sh) \ $(man_MANS) $(DOCBOOK_FILES) doc/mpdconf.example doc/doxygen.conf \ - src/win/mpd_win32_rc.rc.in src/win/mpd.ico + src/win32/mpd_win32_rc.rc.in src/win32/mpd.ico |