From 72386d00f823f35158c52b9bd49d8c0be7dbe32c Mon Sep 17 00:00:00 2001 From: Avuton Olrich Date: Sun, 19 Aug 2007 09:46:13 -0700 Subject: [PATCH] Initial revision 6759 --- .svn/all-wcprops | 71 + .svn/entries | 173 ++ .svn/format | 1 + .svn/prop-base/autogen.sh.svn-base | 5 + .svn/text-base/AUTHORS.svn-base | 47 + .svn/text-base/COPYING.svn-base | 340 ++++ .svn/text-base/ChangeLog.svn-base | 350 ++++ .svn/text-base/INSTALL.svn-base | 131 ++ .svn/text-base/Makefile.am.svn-base | 9 + .svn/text-base/PATCHES.svn-base | 3 + .svn/text-base/README.svn-base | 22 + .svn/text-base/TODO.svn-base | 83 + .svn/text-base/UPGRADING.svn-base | 84 + .svn/text-base/autogen.sh.svn-base | 163 ++ .svn/text-base/configure.ac.svn-base | 816 ++++++++++ AUTHORS | 47 + COPYING | 340 ++++ ChangeLog | 350 ++++ INSTALL | 131 ++ Makefile.am | 9 + PATCHES | 3 + README | 22 + TODO | 83 + UPGRADING | 84 + autogen.sh | 163 ++ configure.ac | 816 ++++++++++ doc/.svn/all-wcprops | 35 + doc/.svn/entries | 88 ++ doc/.svn/format | 1 + doc/.svn/text-base/COMMANDS.svn-base | 275 ++++ doc/.svn/text-base/Makefile.am.svn-base | 4 + doc/.svn/text-base/mpd.1.svn-base | 61 + doc/.svn/text-base/mpd.conf.5.svn-base | 406 +++++ doc/.svn/text-base/mpdconf.example.svn-base | 284 ++++ doc/COMMANDS | 275 ++++ doc/Makefile.am | 4 + doc/mpd.1 | 61 + doc/mpd.conf.5 | 406 +++++ doc/mpdconf.example | 284 ++++ m4/.svn/all-wcprops | 71 + m4/.svn/entries | 160 ++ m4/.svn/format | 1 + m4/.svn/text-base/alsa.m4.svn-base | 142 ++ m4/.svn/text-base/ao.m4.svn-base | 112 ++ m4/.svn/text-base/audiofile.m4.svn-base | 179 +++ m4/.svn/text-base/codeset.m4.svn-base | 23 + m4/.svn/text-base/libFLAC.m4.svn-base | 104 ++ m4/.svn/text-base/libOggFLAC.m4.svn-base | 104 ++ m4/.svn/text-base/libmikmod.m4.svn-base | 207 +++ m4/.svn/text-base/ogg.m4.svn-base | 102 ++ m4/.svn/text-base/pkg.m4.svn-base | 157 ++ m4/.svn/text-base/shout.m4.svn-base | 90 ++ m4/.svn/text-base/vorbis.m4.svn-base | 122 ++ m4/alsa.m4 | 142 ++ m4/ao.m4 | 112 ++ m4/audiofile.m4 | 179 +++ m4/codeset.m4 | 23 + m4/libFLAC.m4 | 104 ++ m4/libOggFLAC.m4 | 104 ++ m4/libmikmod.m4 | 207 +++ m4/ogg.m4 | 102 ++ m4/pkg.m4 | 157 ++ m4/shout.m4 | 90 ++ m4/vorbis.m4 | 122 ++ scripts/.svn/all-wcprops | 29 + scripts/.svn/entries | 79 + scripts/.svn/format | 1 + scripts/.svn/prop-base/makedist.sh.svn-base | 5 + scripts/.svn/prop-base/makerpm.sh.svn-base | 5 + scripts/.svn/prop-base/mpd-indent.sh.svn-base | 5 + scripts/.svn/text-base/makedist.sh.svn-base | 25 + scripts/.svn/text-base/makerpm.sh.svn-base | 29 + scripts/.svn/text-base/mpd-indent.sh.svn-base | 1 + scripts/.svn/text-base/mpd.spec.svn-base | 68 + scripts/makedist.sh | 25 + scripts/makerpm.sh | 29 + scripts/mpd-indent.sh | 1 + scripts/mpd.spec | 68 + src/.svn/all-wcprops | 593 +++++++ src/.svn/entries | 1213 ++++++++++++++ src/.svn/format | 1 + src/.svn/text-base/Makefile.am.svn-base | 153 ++ src/.svn/text-base/ack.h.svn-base | 37 + src/.svn/text-base/audio.c.svn-base | 524 ++++++ src/.svn/text-base/audio.h.svn-base | 83 + src/.svn/text-base/audioOutput.c.svn-base | 263 +++ src/.svn/text-base/audioOutput.h.svn-base | 119 ++ src/.svn/text-base/buffer2array.c.svn-base | 132 ++ src/.svn/text-base/buffer2array.h.svn-base | 32 + src/.svn/text-base/charConv.c.svn-base | 168 ++ src/.svn/text-base/charConv.h.svn-base | 28 + src/.svn/text-base/command.c.svn-base | 1349 ++++++++++++++++ src/.svn/text-base/command.h.svn-base | 50 + src/.svn/text-base/compress.c.svn-base | 411 +++++ src/.svn/text-base/compress.h.svn-base | 47 + src/.svn/text-base/conf.c.svn-base | 408 +++++ src/.svn/text-base/conf.h.svn-base | 99 ++ src/.svn/text-base/dbUtils.c.svn-base | 341 ++++ src/.svn/text-base/dbUtils.h.svn-base | 51 + src/.svn/text-base/decode.c.svn-base | 718 +++++++++ src/.svn/text-base/decode.h.svn-base | 69 + src/.svn/text-base/directory.c.svn-base | 1375 ++++++++++++++++ src/.svn/text-base/directory.h.svn-base | 76 + src/.svn/text-base/gcc.h.svn-base | 67 + src/.svn/text-base/inputPlugin.c.svn-base | 160 ++ src/.svn/text-base/inputPlugin.h.svn-base | 110 ++ src/.svn/text-base/inputStream.c.svn-base | 83 + src/.svn/text-base/inputStream.h.svn-base | 70 + src/.svn/text-base/inputStream_file.c.svn-base | 119 ++ src/.svn/text-base/inputStream_file.h.svn-base | 39 + src/.svn/text-base/inputStream_http.c.svn-base | 945 +++++++++++ src/.svn/text-base/inputStream_http.h.svn-base | 39 + src/.svn/text-base/interface.c.svn-base | 851 ++++++++++ src/.svn/text-base/interface.h.svn-base | 37 + src/.svn/text-base/ioops.h.svn-base | 51 + src/.svn/text-base/list.c.svn-base | 534 +++++++ src/.svn/text-base/list.h.svn-base | 116 ++ src/.svn/text-base/listen.c.svn-base | 253 +++ src/.svn/text-base/listen.h.svn-base | 41 + src/.svn/text-base/locate.c.svn-base | 211 +++ src/.svn/text-base/locate.h.svn-base | 46 + src/.svn/text-base/log.c.svn-base | 263 +++ src/.svn/text-base/log.h.svn-base | 50 + src/.svn/text-base/ls.c.svn-base | 281 ++++ src/.svn/text-base/ls.h.svn-base | 52 + src/.svn/text-base/main.c.svn-base | 481 ++++++ src/.svn/text-base/metadataChunk.c.svn-base | 94 ++ src/.svn/text-base/metadataChunk.h.svn-base | 38 + src/.svn/text-base/mpd_types.h.svn-base | 53 + src/.svn/text-base/myfprintf.c.svn-base | 72 + src/.svn/text-base/myfprintf.h.svn-base | 31 + src/.svn/text-base/normalize.c.svn-base | 51 + src/.svn/text-base/normalize.h.svn-base | 32 + src/.svn/text-base/outputBuffer.c.svn-base | 198 +++ src/.svn/text-base/outputBuffer.h.svn-base | 69 + src/.svn/text-base/path.c.svn-base | 310 ++++ src/.svn/text-base/path.h.svn-base | 69 + src/.svn/text-base/pcm_utils.c.svn-base | 470 ++++++ src/.svn/text-base/pcm_utils.h.svn-base | 57 + src/.svn/text-base/permission.c.svn-base | 140 ++ src/.svn/text-base/permission.h.svn-base | 39 + src/.svn/text-base/player.c.svn-base | 559 +++++++ src/.svn/text-base/player.h.svn-base | 157 ++ src/.svn/text-base/playerData.c.svn-base | 163 ++ src/.svn/text-base/playerData.h.svn-base | 49 + src/.svn/text-base/playlist.c.svn-base | 1668 ++++++++++++++++++++ src/.svn/text-base/playlist.h.svn-base | 159 ++ src/.svn/text-base/replayGain.c.svn-base | 169 ++ src/.svn/text-base/replayGain.h.svn-base | 50 + src/.svn/text-base/sig_handlers.c.svn-base | 159 ++ src/.svn/text-base/sig_handlers.h.svn-base | 42 + src/.svn/text-base/signal_check.c.svn-base | 60 + src/.svn/text-base/signal_check.h.svn-base | 30 + src/.svn/text-base/sllist.c.svn-base | 72 + src/.svn/text-base/sllist.h.svn-base | 52 + src/.svn/text-base/song.c.svn-base | 353 +++++ src/.svn/text-base/song.h.svn-base | 79 + src/.svn/text-base/state_file.c.svn-base | 111 ++ src/.svn/text-base/state_file.h.svn-base | 30 + src/.svn/text-base/stats.c.svn-base | 48 + src/.svn/text-base/stats.h.svn-base | 40 + src/.svn/text-base/storedPlaylist.c.svn-base | 501 ++++++ src/.svn/text-base/storedPlaylist.h.svn-base | 48 + src/.svn/text-base/tag.c.svn-base | 646 ++++++++ src/.svn/text-base/tag.h.svn-base | 89 ++ src/.svn/text-base/tagTracker.c.svn-base | 147 ++ src/.svn/text-base/tagTracker.h.svn-base | 38 + src/.svn/text-base/timer.c.svn-base | 80 + src/.svn/text-base/timer.h.svn-base | 43 + src/.svn/text-base/tree.c.svn-base | 706 +++++++++ src/.svn/text-base/tree.h.svn-base | 62 + src/.svn/text-base/utf8.c.svn-base | 148 ++ src/.svn/text-base/utf8.h.svn-base | 28 + src/.svn/text-base/utils.c.svn-base | 219 +++ src/.svn/text-base/utils.h.svn-base | 87 + src/.svn/text-base/volume.c.svn-base | 552 +++++++ src/.svn/text-base/volume.h.svn-base | 44 + src/.svn/text-base/zeroconf.c.svn-base | 613 +++++++ src/.svn/text-base/zeroconf.h.svn-base | 27 + src/Makefile.am | 153 ++ src/ack.h | 37 + src/audio.c | 524 ++++++ src/audio.h | 83 + src/audioOutput.c | 263 +++ src/audioOutput.h | 119 ++ src/audioOutputs/.svn/all-wcprops | 65 + src/audioOutputs/.svn/entries | 148 ++ src/audioOutputs/.svn/format | 1 + .../.svn/text-base/audioOutput_alsa.c.svn-base | 429 +++++ .../.svn/text-base/audioOutput_ao.c.svn-base | 246 +++ .../.svn/text-base/audioOutput_fifo.c.svn-base | 299 ++++ .../.svn/text-base/audioOutput_jack.c.svn-base | 440 ++++++ .../.svn/text-base/audioOutput_mvp.c.svn-base | 284 ++++ .../.svn/text-base/audioOutput_null.c.svn-base | 74 + .../.svn/text-base/audioOutput_oss.c.svn-base | 575 +++++++ .../.svn/text-base/audioOutput_osx.c.svn-base | 374 +++++ .../.svn/text-base/audioOutput_pulse.c.svn-base | 221 +++ .../.svn/text-base/audioOutput_shout.c.svn-base | 701 ++++++++ src/audioOutputs/audioOutput_alsa.c | 429 +++++ src/audioOutputs/audioOutput_ao.c | 246 +++ src/audioOutputs/audioOutput_fifo.c | 299 ++++ src/audioOutputs/audioOutput_jack.c | 440 ++++++ src/audioOutputs/audioOutput_mvp.c | 284 ++++ src/audioOutputs/audioOutput_null.c | 74 + src/audioOutputs/audioOutput_oss.c | 575 +++++++ src/audioOutputs/audioOutput_osx.c | 374 +++++ src/audioOutputs/audioOutput_pulse.c | 221 +++ src/audioOutputs/audioOutput_shout.c | 701 ++++++++ src/buffer2array.c | 132 ++ src/buffer2array.h | 32 + src/charConv.c | 168 ++ src/charConv.h | 28 + src/command.c | 1349 ++++++++++++++++ src/command.h | 50 + src/compress.c | 411 +++++ src/compress.h | 47 + src/conf.c | 408 +++++ src/conf.h | 99 ++ src/dbUtils.c | 341 ++++ src/dbUtils.h | 51 + src/decode.c | 718 +++++++++ src/decode.h | 69 + src/directory.c | 1375 ++++++++++++++++ src/directory.h | 76 + src/gcc.h | 67 + src/inputPlugin.c | 160 ++ src/inputPlugin.h | 110 ++ src/inputPlugins/.svn/all-wcprops | 89 ++ src/inputPlugins/.svn/entries | 196 +++ src/inputPlugins/.svn/format | 1 + .../.svn/text-base/_flac_common.c.svn-base | 211 +++ .../.svn/text-base/_flac_common.h.svn-base | 187 +++ .../.svn/text-base/_ogg_common.c.svn-base | 73 + .../.svn/text-base/_ogg_common.h.svn-base | 35 + .../.svn/text-base/aac_plugin.c.svn-base | 476 ++++++ .../.svn/text-base/audiofile_plugin.c.svn-base | 188 +++ .../.svn/text-base/flac_plugin.c.svn-base | 530 +++++++ .../.svn/text-base/mod_plugin.c.svn-base | 299 ++++ .../.svn/text-base/mp3_plugin.c.svn-base | 1094 +++++++++++++ .../.svn/text-base/mp4_plugin.c.svn-base | 450 ++++++ .../.svn/text-base/mpc_plugin.c.svn-base | 359 +++++ .../.svn/text-base/oggflac_plugin.c.svn-base | 423 +++++ .../.svn/text-base/oggvorbis_plugin.c.svn-base | 429 +++++ .../.svn/text-base/wavpack_plugin.c.svn-base | 594 +++++++ src/inputPlugins/_flac_common.c | 211 +++ src/inputPlugins/_flac_common.h | 187 +++ src/inputPlugins/_ogg_common.c | 73 + src/inputPlugins/_ogg_common.h | 35 + src/inputPlugins/aac_plugin.c | 476 ++++++ src/inputPlugins/audiofile_plugin.c | 188 +++ src/inputPlugins/flac_plugin.c | 530 +++++++ src/inputPlugins/mod_plugin.c | 299 ++++ src/inputPlugins/mp3_plugin.c | 1094 +++++++++++++ src/inputPlugins/mp4_plugin.c | 450 ++++++ src/inputPlugins/mpc_plugin.c | 359 +++++ src/inputPlugins/oggflac_plugin.c | 423 +++++ src/inputPlugins/oggvorbis_plugin.c | 429 +++++ src/inputPlugins/wavpack_plugin.c | 594 +++++++ src/inputStream.c | 83 + src/inputStream.h | 70 + src/inputStream_file.c | 119 ++ src/inputStream_file.h | 39 + src/inputStream_http.c | 945 +++++++++++ src/inputStream_http.h | 39 + src/interface.c | 851 ++++++++++ src/interface.h | 37 + src/ioops.h | 51 + src/list.c | 534 +++++++ src/list.h | 116 ++ src/listen.c | 253 +++ src/listen.h | 41 + src/locate.c | 211 +++ src/locate.h | 46 + src/log.c | 263 +++ src/log.h | 50 + src/ls.c | 281 ++++ src/ls.h | 52 + src/main.c | 481 ++++++ src/metadataChunk.c | 94 ++ src/metadataChunk.h | 38 + src/mp4ff/.svn/all-wcprops | 89 ++ src/mp4ff/.svn/entries | 196 +++ src/mp4ff/.svn/format | 1 + src/mp4ff/.svn/text-base/Makefile.am.svn-base | 9 + src/mp4ff/.svn/text-base/drms.c.svn-base | 1043 ++++++++++++ src/mp4ff/.svn/text-base/drms.h.svn-base | 40 + src/mp4ff/.svn/text-base/drmstables.h.svn-base | 449 ++++++ src/mp4ff/.svn/text-base/mp4atom.c.svn-base | 781 +++++++++ src/mp4ff/.svn/text-base/mp4ff.c.svn-base | 430 +++++ src/mp4ff/.svn/text-base/mp4ff.dsp.svn-base | 144 ++ src/mp4ff/.svn/text-base/mp4ff.h.svn-base | 128 ++ .../.svn/text-base/mp4ff_int_types.h.svn-base | 32 + src/mp4ff/.svn/text-base/mp4ffint.h.svn-base | 329 ++++ src/mp4ff/.svn/text-base/mp4meta.c.svn-base | 414 +++++ src/mp4ff/.svn/text-base/mp4sample.c.svn-base | 152 ++ src/mp4ff/.svn/text-base/mp4tagupdate.c.svn-base | 645 ++++++++ src/mp4ff/.svn/text-base/mp4util.c.svn-base | 188 +++ src/mp4ff/Makefile.am | 9 + src/mp4ff/drms.c | 1043 ++++++++++++ src/mp4ff/drms.h | 40 + src/mp4ff/drmstables.h | 449 ++++++ src/mp4ff/mp4atom.c | 781 +++++++++ src/mp4ff/mp4ff.c | 430 +++++ src/mp4ff/mp4ff.dsp | 144 ++ src/mp4ff/mp4ff.h | 128 ++ src/mp4ff/mp4ff_int_types.h | 32 + src/mp4ff/mp4ffint.h | 329 ++++ src/mp4ff/mp4meta.c | 414 +++++ src/mp4ff/mp4sample.c | 152 ++ src/mp4ff/mp4tagupdate.c | 645 ++++++++ src/mp4ff/mp4util.c | 188 +++ src/mpd_types.h | 53 + src/myfprintf.c | 72 + src/myfprintf.h | 31 + src/normalize.c | 51 + src/normalize.h | 32 + src/outputBuffer.c | 198 +++ src/outputBuffer.h | 69 + src/path.c | 310 ++++ src/path.h | 69 + src/pcm_utils.c | 470 ++++++ src/pcm_utils.h | 57 + src/permission.c | 140 ++ src/permission.h | 39 + src/player.c | 559 +++++++ src/player.h | 157 ++ src/playerData.c | 163 ++ src/playerData.h | 49 + src/playlist.c | 1668 ++++++++++++++++++++ src/playlist.h | 159 ++ src/replayGain.c | 169 ++ src/replayGain.h | 50 + src/sig_handlers.c | 159 ++ src/sig_handlers.h | 42 + src/signal_check.c | 60 + src/signal_check.h | 30 + src/sllist.c | 72 + src/sllist.h | 52 + src/song.c | 353 +++++ src/song.h | 79 + src/state_file.c | 111 ++ src/state_file.h | 30 + src/stats.c | 48 + src/stats.h | 40 + src/storedPlaylist.c | 501 ++++++ src/storedPlaylist.h | 48 + src/tag.c | 646 ++++++++ src/tag.h | 89 ++ src/tagTracker.c | 147 ++ src/tagTracker.h | 38 + src/timer.c | 80 + src/timer.h | 43 + src/tree.c | 706 +++++++++ src/tree.h | 62 + src/utf8.c | 148 ++ src/utf8.h | 28 + src/utils.c | 219 +++ src/utils.h | 87 + src/volume.c | 552 +++++++ src/volume.h | 44 + src/zeroconf.c | 613 +++++++ src/zeroconf.h | 27 + 362 files changed, 82525 insertions(+) create mode 100644 .svn/all-wcprops create mode 100644 .svn/entries create mode 100644 .svn/format create mode 100644 .svn/prop-base/autogen.sh.svn-base create mode 100644 .svn/text-base/AUTHORS.svn-base create mode 100644 .svn/text-base/COPYING.svn-base create mode 100644 .svn/text-base/ChangeLog.svn-base create mode 100644 .svn/text-base/INSTALL.svn-base create mode 100644 .svn/text-base/Makefile.am.svn-base create mode 100644 .svn/text-base/PATCHES.svn-base create mode 100644 .svn/text-base/README.svn-base create mode 100644 .svn/text-base/TODO.svn-base create mode 100644 .svn/text-base/UPGRADING.svn-base create mode 100644 .svn/text-base/autogen.sh.svn-base create mode 100644 .svn/text-base/configure.ac.svn-base create mode 100644 AUTHORS create mode 100644 COPYING create mode 100644 ChangeLog create mode 100644 INSTALL create mode 100644 Makefile.am create mode 100644 PATCHES create mode 100644 README create mode 100644 TODO create mode 100644 UPGRADING create mode 100755 autogen.sh create mode 100644 configure.ac create mode 100644 doc/.svn/all-wcprops create mode 100644 doc/.svn/entries create mode 100644 doc/.svn/format create mode 100644 doc/.svn/text-base/COMMANDS.svn-base create mode 100644 doc/.svn/text-base/Makefile.am.svn-base create mode 100644 doc/.svn/text-base/mpd.1.svn-base create mode 100644 doc/.svn/text-base/mpd.conf.5.svn-base create mode 100644 doc/.svn/text-base/mpdconf.example.svn-base create mode 100644 doc/COMMANDS create mode 100644 doc/Makefile.am create mode 100644 doc/mpd.1 create mode 100644 doc/mpd.conf.5 create mode 100644 doc/mpdconf.example create mode 100644 m4/.svn/all-wcprops create mode 100644 m4/.svn/entries create mode 100644 m4/.svn/format create mode 100644 m4/.svn/text-base/alsa.m4.svn-base create mode 100644 m4/.svn/text-base/ao.m4.svn-base create mode 100644 m4/.svn/text-base/audiofile.m4.svn-base create mode 100644 m4/.svn/text-base/codeset.m4.svn-base create mode 100644 m4/.svn/text-base/libFLAC.m4.svn-base create mode 100644 m4/.svn/text-base/libOggFLAC.m4.svn-base create mode 100644 m4/.svn/text-base/libmikmod.m4.svn-base create mode 100644 m4/.svn/text-base/ogg.m4.svn-base create mode 100644 m4/.svn/text-base/pkg.m4.svn-base create mode 100644 m4/.svn/text-base/shout.m4.svn-base create mode 100644 m4/.svn/text-base/vorbis.m4.svn-base create mode 100644 m4/alsa.m4 create mode 100644 m4/ao.m4 create mode 100644 m4/audiofile.m4 create mode 100644 m4/codeset.m4 create mode 100644 m4/libFLAC.m4 create mode 100644 m4/libOggFLAC.m4 create mode 100644 m4/libmikmod.m4 create mode 100644 m4/ogg.m4 create mode 100644 m4/pkg.m4 create mode 100644 m4/shout.m4 create mode 100644 m4/vorbis.m4 create mode 100644 scripts/.svn/all-wcprops create mode 100644 scripts/.svn/entries create mode 100644 scripts/.svn/format create mode 100644 scripts/.svn/prop-base/makedist.sh.svn-base create mode 100644 scripts/.svn/prop-base/makerpm.sh.svn-base create mode 100644 scripts/.svn/prop-base/mpd-indent.sh.svn-base create mode 100644 scripts/.svn/text-base/makedist.sh.svn-base create mode 100644 scripts/.svn/text-base/makerpm.sh.svn-base create mode 100644 scripts/.svn/text-base/mpd-indent.sh.svn-base create mode 100644 scripts/.svn/text-base/mpd.spec.svn-base create mode 100755 scripts/makedist.sh create mode 100755 scripts/makerpm.sh create mode 100755 scripts/mpd-indent.sh create mode 100644 scripts/mpd.spec create mode 100644 src/.svn/all-wcprops create mode 100644 src/.svn/entries create mode 100644 src/.svn/format create mode 100644 src/.svn/text-base/Makefile.am.svn-base create mode 100644 src/.svn/text-base/ack.h.svn-base create mode 100644 src/.svn/text-base/audio.c.svn-base create mode 100644 src/.svn/text-base/audio.h.svn-base create mode 100644 src/.svn/text-base/audioOutput.c.svn-base create mode 100644 src/.svn/text-base/audioOutput.h.svn-base create mode 100644 src/.svn/text-base/buffer2array.c.svn-base create mode 100644 src/.svn/text-base/buffer2array.h.svn-base create mode 100644 src/.svn/text-base/charConv.c.svn-base create mode 100644 src/.svn/text-base/charConv.h.svn-base create mode 100644 src/.svn/text-base/command.c.svn-base create mode 100644 src/.svn/text-base/command.h.svn-base create mode 100644 src/.svn/text-base/compress.c.svn-base create mode 100644 src/.svn/text-base/compress.h.svn-base create mode 100644 src/.svn/text-base/conf.c.svn-base create mode 100644 src/.svn/text-base/conf.h.svn-base create mode 100644 src/.svn/text-base/dbUtils.c.svn-base create mode 100644 src/.svn/text-base/dbUtils.h.svn-base create mode 100644 src/.svn/text-base/decode.c.svn-base create mode 100644 src/.svn/text-base/decode.h.svn-base create mode 100644 src/.svn/text-base/directory.c.svn-base create mode 100644 src/.svn/text-base/directory.h.svn-base create mode 100644 src/.svn/text-base/gcc.h.svn-base create mode 100644 src/.svn/text-base/inputPlugin.c.svn-base create mode 100644 src/.svn/text-base/inputPlugin.h.svn-base create mode 100644 src/.svn/text-base/inputStream.c.svn-base create mode 100644 src/.svn/text-base/inputStream.h.svn-base create mode 100644 src/.svn/text-base/inputStream_file.c.svn-base create mode 100644 src/.svn/text-base/inputStream_file.h.svn-base create mode 100644 src/.svn/text-base/inputStream_http.c.svn-base create mode 100644 src/.svn/text-base/inputStream_http.h.svn-base create mode 100644 src/.svn/text-base/interface.c.svn-base create mode 100644 src/.svn/text-base/interface.h.svn-base create mode 100644 src/.svn/text-base/ioops.h.svn-base create mode 100644 src/.svn/text-base/list.c.svn-base create mode 100644 src/.svn/text-base/list.h.svn-base create mode 100644 src/.svn/text-base/listen.c.svn-base create mode 100644 src/.svn/text-base/listen.h.svn-base create mode 100644 src/.svn/text-base/locate.c.svn-base create mode 100644 src/.svn/text-base/locate.h.svn-base create mode 100644 src/.svn/text-base/log.c.svn-base create mode 100644 src/.svn/text-base/log.h.svn-base create mode 100644 src/.svn/text-base/ls.c.svn-base create mode 100644 src/.svn/text-base/ls.h.svn-base create mode 100644 src/.svn/text-base/main.c.svn-base create mode 100644 src/.svn/text-base/metadataChunk.c.svn-base create mode 100644 src/.svn/text-base/metadataChunk.h.svn-base create mode 100644 src/.svn/text-base/mpd_types.h.svn-base create mode 100644 src/.svn/text-base/myfprintf.c.svn-base create mode 100644 src/.svn/text-base/myfprintf.h.svn-base create mode 100644 src/.svn/text-base/normalize.c.svn-base create mode 100644 src/.svn/text-base/normalize.h.svn-base create mode 100644 src/.svn/text-base/outputBuffer.c.svn-base create mode 100644 src/.svn/text-base/outputBuffer.h.svn-base create mode 100644 src/.svn/text-base/path.c.svn-base create mode 100644 src/.svn/text-base/path.h.svn-base create mode 100644 src/.svn/text-base/pcm_utils.c.svn-base create mode 100644 src/.svn/text-base/pcm_utils.h.svn-base create mode 100644 src/.svn/text-base/permission.c.svn-base create mode 100644 src/.svn/text-base/permission.h.svn-base create mode 100644 src/.svn/text-base/player.c.svn-base create mode 100644 src/.svn/text-base/player.h.svn-base create mode 100644 src/.svn/text-base/playerData.c.svn-base create mode 100644 src/.svn/text-base/playerData.h.svn-base create mode 100644 src/.svn/text-base/playlist.c.svn-base create mode 100644 src/.svn/text-base/playlist.h.svn-base create mode 100644 src/.svn/text-base/replayGain.c.svn-base create mode 100644 src/.svn/text-base/replayGain.h.svn-base create mode 100644 src/.svn/text-base/sig_handlers.c.svn-base create mode 100644 src/.svn/text-base/sig_handlers.h.svn-base create mode 100644 src/.svn/text-base/signal_check.c.svn-base create mode 100644 src/.svn/text-base/signal_check.h.svn-base create mode 100644 src/.svn/text-base/sllist.c.svn-base create mode 100644 src/.svn/text-base/sllist.h.svn-base create mode 100644 src/.svn/text-base/song.c.svn-base create mode 100644 src/.svn/text-base/song.h.svn-base create mode 100644 src/.svn/text-base/state_file.c.svn-base create mode 100644 src/.svn/text-base/state_file.h.svn-base create mode 100644 src/.svn/text-base/stats.c.svn-base create mode 100644 src/.svn/text-base/stats.h.svn-base create mode 100644 src/.svn/text-base/storedPlaylist.c.svn-base create mode 100644 src/.svn/text-base/storedPlaylist.h.svn-base create mode 100644 src/.svn/text-base/tag.c.svn-base create mode 100644 src/.svn/text-base/tag.h.svn-base create mode 100644 src/.svn/text-base/tagTracker.c.svn-base create mode 100644 src/.svn/text-base/tagTracker.h.svn-base create mode 100644 src/.svn/text-base/timer.c.svn-base create mode 100644 src/.svn/text-base/timer.h.svn-base create mode 100644 src/.svn/text-base/tree.c.svn-base create mode 100644 src/.svn/text-base/tree.h.svn-base create mode 100644 src/.svn/text-base/utf8.c.svn-base create mode 100644 src/.svn/text-base/utf8.h.svn-base create mode 100644 src/.svn/text-base/utils.c.svn-base create mode 100644 src/.svn/text-base/utils.h.svn-base create mode 100644 src/.svn/text-base/volume.c.svn-base create mode 100644 src/.svn/text-base/volume.h.svn-base create mode 100644 src/.svn/text-base/zeroconf.c.svn-base create mode 100644 src/.svn/text-base/zeroconf.h.svn-base create mode 100644 src/Makefile.am create mode 100644 src/ack.h create mode 100644 src/audio.c create mode 100644 src/audio.h create mode 100644 src/audioOutput.c create mode 100644 src/audioOutput.h create mode 100644 src/audioOutputs/.svn/all-wcprops create mode 100644 src/audioOutputs/.svn/entries create mode 100644 src/audioOutputs/.svn/format create mode 100644 src/audioOutputs/.svn/text-base/audioOutput_alsa.c.svn-base create mode 100644 src/audioOutputs/.svn/text-base/audioOutput_ao.c.svn-base create mode 100644 src/audioOutputs/.svn/text-base/audioOutput_fifo.c.svn-base create mode 100644 src/audioOutputs/.svn/text-base/audioOutput_jack.c.svn-base create mode 100644 src/audioOutputs/.svn/text-base/audioOutput_mvp.c.svn-base create mode 100644 src/audioOutputs/.svn/text-base/audioOutput_null.c.svn-base create mode 100644 src/audioOutputs/.svn/text-base/audioOutput_oss.c.svn-base create mode 100644 src/audioOutputs/.svn/text-base/audioOutput_osx.c.svn-base create mode 100644 src/audioOutputs/.svn/text-base/audioOutput_pulse.c.svn-base create mode 100644 src/audioOutputs/.svn/text-base/audioOutput_shout.c.svn-base create mode 100644 src/audioOutputs/audioOutput_alsa.c create mode 100644 src/audioOutputs/audioOutput_ao.c create mode 100644 src/audioOutputs/audioOutput_fifo.c create mode 100644 src/audioOutputs/audioOutput_jack.c create mode 100644 src/audioOutputs/audioOutput_mvp.c create mode 100644 src/audioOutputs/audioOutput_null.c create mode 100644 src/audioOutputs/audioOutput_oss.c create mode 100644 src/audioOutputs/audioOutput_osx.c create mode 100644 src/audioOutputs/audioOutput_pulse.c create mode 100644 src/audioOutputs/audioOutput_shout.c create mode 100644 src/buffer2array.c create mode 100644 src/buffer2array.h create mode 100644 src/charConv.c create mode 100644 src/charConv.h create mode 100644 src/command.c create mode 100644 src/command.h create mode 100644 src/compress.c create mode 100644 src/compress.h create mode 100644 src/conf.c create mode 100644 src/conf.h create mode 100644 src/dbUtils.c create mode 100644 src/dbUtils.h create mode 100644 src/decode.c create mode 100644 src/decode.h create mode 100644 src/directory.c create mode 100644 src/directory.h create mode 100644 src/gcc.h create mode 100644 src/inputPlugin.c create mode 100644 src/inputPlugin.h create mode 100644 src/inputPlugins/.svn/all-wcprops create mode 100644 src/inputPlugins/.svn/entries create mode 100644 src/inputPlugins/.svn/format create mode 100644 src/inputPlugins/.svn/text-base/_flac_common.c.svn-base create mode 100644 src/inputPlugins/.svn/text-base/_flac_common.h.svn-base create mode 100644 src/inputPlugins/.svn/text-base/_ogg_common.c.svn-base create mode 100644 src/inputPlugins/.svn/text-base/_ogg_common.h.svn-base create mode 100644 src/inputPlugins/.svn/text-base/aac_plugin.c.svn-base create mode 100644 src/inputPlugins/.svn/text-base/audiofile_plugin.c.svn-base create mode 100644 src/inputPlugins/.svn/text-base/flac_plugin.c.svn-base create mode 100644 src/inputPlugins/.svn/text-base/mod_plugin.c.svn-base create mode 100644 src/inputPlugins/.svn/text-base/mp3_plugin.c.svn-base create mode 100644 src/inputPlugins/.svn/text-base/mp4_plugin.c.svn-base create mode 100644 src/inputPlugins/.svn/text-base/mpc_plugin.c.svn-base create mode 100644 src/inputPlugins/.svn/text-base/oggflac_plugin.c.svn-base create mode 100644 src/inputPlugins/.svn/text-base/oggvorbis_plugin.c.svn-base create mode 100644 src/inputPlugins/.svn/text-base/wavpack_plugin.c.svn-base create mode 100644 src/inputPlugins/_flac_common.c create mode 100644 src/inputPlugins/_flac_common.h create mode 100644 src/inputPlugins/_ogg_common.c create mode 100644 src/inputPlugins/_ogg_common.h create mode 100644 src/inputPlugins/aac_plugin.c create mode 100644 src/inputPlugins/audiofile_plugin.c create mode 100644 src/inputPlugins/flac_plugin.c create mode 100644 src/inputPlugins/mod_plugin.c create mode 100644 src/inputPlugins/mp3_plugin.c create mode 100644 src/inputPlugins/mp4_plugin.c create mode 100644 src/inputPlugins/mpc_plugin.c create mode 100644 src/inputPlugins/oggflac_plugin.c create mode 100644 src/inputPlugins/oggvorbis_plugin.c create mode 100644 src/inputPlugins/wavpack_plugin.c create mode 100644 src/inputStream.c create mode 100644 src/inputStream.h create mode 100644 src/inputStream_file.c create mode 100644 src/inputStream_file.h create mode 100644 src/inputStream_http.c create mode 100644 src/inputStream_http.h create mode 100644 src/interface.c create mode 100644 src/interface.h create mode 100644 src/ioops.h create mode 100644 src/list.c create mode 100644 src/list.h create mode 100644 src/listen.c create mode 100644 src/listen.h create mode 100644 src/locate.c create mode 100644 src/locate.h create mode 100644 src/log.c create mode 100644 src/log.h create mode 100644 src/ls.c create mode 100644 src/ls.h create mode 100644 src/main.c create mode 100644 src/metadataChunk.c create mode 100644 src/metadataChunk.h create mode 100644 src/mp4ff/.svn/all-wcprops create mode 100644 src/mp4ff/.svn/entries create mode 100644 src/mp4ff/.svn/format create mode 100644 src/mp4ff/.svn/text-base/Makefile.am.svn-base create mode 100644 src/mp4ff/.svn/text-base/drms.c.svn-base create mode 100644 src/mp4ff/.svn/text-base/drms.h.svn-base create mode 100644 src/mp4ff/.svn/text-base/drmstables.h.svn-base create mode 100644 src/mp4ff/.svn/text-base/mp4atom.c.svn-base create mode 100644 src/mp4ff/.svn/text-base/mp4ff.c.svn-base create mode 100644 src/mp4ff/.svn/text-base/mp4ff.dsp.svn-base create mode 100644 src/mp4ff/.svn/text-base/mp4ff.h.svn-base create mode 100644 src/mp4ff/.svn/text-base/mp4ff_int_types.h.svn-base create mode 100644 src/mp4ff/.svn/text-base/mp4ffint.h.svn-base create mode 100644 src/mp4ff/.svn/text-base/mp4meta.c.svn-base create mode 100644 src/mp4ff/.svn/text-base/mp4sample.c.svn-base create mode 100644 src/mp4ff/.svn/text-base/mp4tagupdate.c.svn-base create mode 100644 src/mp4ff/.svn/text-base/mp4util.c.svn-base create mode 100644 src/mp4ff/Makefile.am create mode 100644 src/mp4ff/drms.c create mode 100644 src/mp4ff/drms.h create mode 100644 src/mp4ff/drmstables.h create mode 100644 src/mp4ff/mp4atom.c create mode 100644 src/mp4ff/mp4ff.c create mode 100644 src/mp4ff/mp4ff.dsp create mode 100644 src/mp4ff/mp4ff.h create mode 100644 src/mp4ff/mp4ff_int_types.h create mode 100644 src/mp4ff/mp4ffint.h create mode 100644 src/mp4ff/mp4meta.c create mode 100644 src/mp4ff/mp4sample.c create mode 100644 src/mp4ff/mp4tagupdate.c create mode 100644 src/mp4ff/mp4util.c create mode 100644 src/mpd_types.h create mode 100644 src/myfprintf.c create mode 100644 src/myfprintf.h create mode 100644 src/normalize.c create mode 100644 src/normalize.h create mode 100644 src/outputBuffer.c create mode 100644 src/outputBuffer.h create mode 100644 src/path.c create mode 100644 src/path.h create mode 100644 src/pcm_utils.c create mode 100644 src/pcm_utils.h create mode 100644 src/permission.c create mode 100644 src/permission.h create mode 100644 src/player.c create mode 100644 src/player.h create mode 100644 src/playerData.c create mode 100644 src/playerData.h create mode 100644 src/playlist.c create mode 100644 src/playlist.h create mode 100644 src/replayGain.c create mode 100644 src/replayGain.h create mode 100644 src/sig_handlers.c create mode 100644 src/sig_handlers.h create mode 100644 src/signal_check.c create mode 100644 src/signal_check.h create mode 100644 src/sllist.c create mode 100644 src/sllist.h create mode 100644 src/song.c create mode 100644 src/song.h create mode 100644 src/state_file.c create mode 100644 src/state_file.h create mode 100644 src/stats.c create mode 100644 src/stats.h create mode 100644 src/storedPlaylist.c create mode 100644 src/storedPlaylist.h create mode 100644 src/tag.c create mode 100644 src/tag.h create mode 100644 src/tagTracker.c create mode 100644 src/tagTracker.h create mode 100644 src/timer.c create mode 100644 src/timer.h create mode 100644 src/tree.c create mode 100644 src/tree.h create mode 100644 src/utf8.c create mode 100644 src/utf8.h create mode 100644 src/utils.c create mode 100644 src/utils.h create mode 100644 src/volume.c create mode 100644 src/volume.h create mode 100644 src/zeroconf.c create mode 100644 src/zeroconf.h diff --git a/.svn/all-wcprops b/.svn/all-wcprops new file mode 100644 index 0000000..599f9de --- /dev/null +++ b/.svn/all-wcprops @@ -0,0 +1,71 @@ +K 25 +svn:wc:ra_dav:version-url +V 33 +/!svn/ver/6759/mpd/branches/q-mpd +END +UPGRADING +K 25 +svn:wc:ra_dav:version-url +V 43 +/!svn/ver/6756/mpd/branches/q-mpd/UPGRADING +END +configure.ac +K 25 +svn:wc:ra_dav:version-url +V 46 +/!svn/ver/6756/mpd/branches/q-mpd/configure.ac +END +AUTHORS +K 25 +svn:wc:ra_dav:version-url +V 41 +/!svn/ver/6756/mpd/branches/q-mpd/AUTHORS +END +TODO +K 25 +svn:wc:ra_dav:version-url +V 38 +/!svn/ver/6756/mpd/branches/q-mpd/TODO +END +INSTALL +K 25 +svn:wc:ra_dav:version-url +V 41 +/!svn/ver/6756/mpd/branches/q-mpd/INSTALL +END +ChangeLog +K 25 +svn:wc:ra_dav:version-url +V 43 +/!svn/ver/6756/mpd/branches/q-mpd/ChangeLog +END +PATCHES +K 25 +svn:wc:ra_dav:version-url +V 41 +/!svn/ver/6759/mpd/branches/q-mpd/PATCHES +END +COPYING +K 25 +svn:wc:ra_dav:version-url +V 41 +/!svn/ver/6756/mpd/branches/q-mpd/COPYING +END +Makefile.am +K 25 +svn:wc:ra_dav:version-url +V 45 +/!svn/ver/6756/mpd/branches/q-mpd/Makefile.am +END +autogen.sh +K 25 +svn:wc:ra_dav:version-url +V 44 +/!svn/ver/6756/mpd/branches/q-mpd/autogen.sh +END +README +K 25 +svn:wc:ra_dav:version-url +V 40 +/!svn/ver/6756/mpd/branches/q-mpd/README +END diff --git a/.svn/entries b/.svn/entries new file mode 100644 index 0000000..a6d4499 --- /dev/null +++ b/.svn/entries @@ -0,0 +1,173 @@ +8 + +dir +6759 +https://svn.musicpd.org/mpd/branches/q-mpd +https://svn.musicpd.org + + + +2007-08-19T16:22:16.613425Z +6759 +qball + + +svn:special svn:externals svn:needs-lock + + + + + + + + + + + +09075e82-0dd4-0310-85a5-a0d7c8717e4f + +UPGRADING +file + + + + +2007-08-19T16:45:19.000000Z +1ef7c794156f9beb118cb34db120e01b +2007-05-27T13:30:46.426770Z +6292 +jat + +m4 +dir + +AUTHORS +file + + + + +2007-08-19T16:45:19.000000Z +82cf5e49321b0fb10c6982ef8a1847b9 +2007-06-25T12:13:45.639140Z +6654 +jat + +PATCHES +file + + + + +2007-08-19T16:45:19.000000Z +930d298d4d7be5c177d51126580df2e2 +2007-08-19T16:22:16.613425Z +6759 +qball + +ChangeLog +file + + + + +2007-08-19T16:45:19.000000Z +dbed48f173503a501605c77ddce82633 +2007-06-24T20:40:04.904255Z +6651 +jat + +src +dir + +scripts +dir + +README +file + + + + +2007-08-19T16:45:19.000000Z +a232410650e7a52cb669c7adb1910272 +2007-03-31T15:20:39.763925Z +5786 +sbh + +configure.ac +file + + + + +2007-08-19T16:45:19.000000Z +333c3370788681145a16b12eb11d7f4b +2007-06-24T21:31:08.836846Z +6653 +jat + +TODO +file + + + + +2007-08-19T16:45:19.000000Z +6b30294666ecdf6ebd449cf7a773848e +2007-05-27T13:15:12.889483Z +6291 +jat + +doc +dir + +INSTALL +file + + + + +2007-08-19T16:45:19.000000Z +2ff263a81aa37bce426297c7342790c6 +2007-05-27T13:38:52.043080Z +6293 +jat + +COPYING +file + + + + +2007-08-19T16:45:19.000000Z +94d55d512a9ba36caa9b7df079bae19f +2004-02-23T23:41:20.522622Z +1 +shank + +Makefile.am +file + + + + +2007-08-19T16:45:19.000000Z +8f48adfb5f0565bd7bf0ecd06afb02ef +2006-07-17T00:15:31.083053Z +4377 +normalperson + +autogen.sh +file + + + + +2007-08-19T16:45:19.000000Z +fcd457e8d86e070c40e1d9ffc3f05bec +2006-09-13T22:29:57.061836Z +4773 +jat +has-props + diff --git a/.svn/format b/.svn/format new file mode 100644 index 0000000..45a4fb7 --- /dev/null +++ b/.svn/format @@ -0,0 +1 @@ +8 diff --git a/.svn/prop-base/autogen.sh.svn-base b/.svn/prop-base/autogen.sh.svn-base new file mode 100644 index 0000000..a669705 --- /dev/null +++ b/.svn/prop-base/autogen.sh.svn-base @@ -0,0 +1,5 @@ +K 14 +svn:executable +V 0 + +END diff --git a/.svn/text-base/AUTHORS.svn-base b/.svn/text-base/AUTHORS.svn-base new file mode 100644 index 0000000..90c3392 --- /dev/null +++ b/.svn/text-base/AUTHORS.svn-base @@ -0,0 +1,47 @@ +Current Developers +------------------ +Warren Dukes + general + +J. Alexander Treuman + general, MP3, ID3, PulseAudio, format conversion, stored playlists + +Eric Wong + general, FLAC, mpd-ke branch + +José Anarch + JACK plugin + +Guus Sliepen + libsamplerate code + +Jim Ramsay + Zerconf/avahi support + +Qball Cow + Playlist commands + +Patrik Weiskircher + Stored playlist commands + +Laszlo Ashin + WavPack support + +Former Developers +----------------- +tw-nym + +Nagilum + setuid + +Niklas Hofer + 'next' and 'previous' patch + +mackstann + command.c and signal handling cleanup + +AliasMrJones + replayGain + +mp4ff copyrighted by M. Bakker, Ahead Software AG, http://www.nero.com +compress.[ch] copyrighted by fluffy diff --git a/.svn/text-base/COPYING.svn-base b/.svn/text-base/COPYING.svn-base new file mode 100644 index 0000000..d60c31a --- /dev/null +++ b/.svn/text-base/COPYING.svn-base @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/.svn/text-base/ChangeLog.svn-base b/.svn/text-base/ChangeLog.svn-base new file mode 100644 index 0000000..2e629cf --- /dev/null +++ b/.svn/text-base/ChangeLog.svn-base @@ -0,0 +1,350 @@ +ver 0.14.0 (????/??/??) +* New null audio output +* Zeroconf support using Bonjour +* New zeroconf_enabled option so that Zeroconf support can be disabled +* Enable the AAC input plugin if support for it has been compiled in +* Support for playing MP4 streams +* Stop the player/decode processes when not playing to allow the CPU to sleep +* Fix a bug where closing an ALSA dmix device could cause MPD to hang +* Make the shout output block while trying to connect instead of failing +* New timeout parameter for shout outputs to define a connection timeout +* New FIFO audio output +* Support for WavPack files + +ver 0.13.0 (2007/5/28) +* New JACK audio output +* Support for "file" as an alternative to "filename" in search, find, and list +* FLAC 1.1.3 API support +* New playlistadd command for adding to stored playlists +* New playlistclear command for clearing stored playlists +* Fix a bug where "find any" and "list any" wouldn't return any results +* Make "list any" return an error instead of no results and an OK +* New gapless_mp3_playback option to disable gapless MP3 playback +* Support for seeking HTTP streams +* Zeroconf support using Avahi +* libsamplerate support for high quality audio resampling +* ID3v2 "Original Artist/Performer" tag support +* New playlistsearch command for searching the playlist (similar to "search") +* New playlistfind command for finding songs in the playlist (similar to "find") +* libmikmod 3.2.0 beta support +* New tagtypes command for retrieving a list of available tag types +* Fix a bug where no ACK was returned if loading a playlist failed +* Fix a bug where db_update in stats would be 0 after initial database creation +* New count command for getting stats on found songs (similar to "find") +* New playlistmove command for moving songs in stored playlists +* New playlistdelete command for deleting songs from stored playlists +* New rename command for renaming stored playlists +* Increased default buffer_before_play from 0% to 10% to prevent skipping +* Lots of bug fixes, cleaned up code, and performance improvements + +ver 0.12.2 (2007/3/20) +* Fix a bug where clients could cause MPD to segfault + +ver 0.12.1 (2006/10/10) +* Fix segfault when scanning an MP3 that has a Xing tag with 0 frames +* Fix segfault when there's no audio output specified and one can't be detected +* Fix handling of escaping in quotes +* Allow a quality of -1 to be specified for shout outputs +* A few minor cleanups + +ver 0.12.0 (2006/9/22) +* New audio output code which supports: + * A plugin-like architecture + * Non-libao ("native") outputs: + * ALSA + * OSS + * OS X + * Media MVP + * PulseAudio + * Shout (Icecast or Shoutcast) + * Playing through multiple outputs at once + * Enabling/disabling outputs while MPD is running + * Saving output state (enabled/disabled) to the state_file +* OggFLAC support +* Musepack support +* Gapless MP3 playback +* MP3 ReplayGain support (using ID3v2 tags only) +* Support for MP2 files if MP3 support is enabled +* Composer, Performer, Comment, and Disc metadata support +* New outputs command for listing available audio outputs +* New enableoutput and disableoutput commands for enabling/disabling outputs +* New plchangesposid command for a stripped down version of plchanges +* New addid command for adding to the playlist and returning a song ID +* New commands and notcommands commands for checking available commands +* Can now specify any supported metadata type or "any" in search, find, and list +* New volume_normalization parameter for enabling Audio Compress normalization +* New metadata_to_use parameter for choosing supported metadata types +* New pid_file parameter for saving the MPD process ID to the specified file +* The db_file parameter is now required +* The port parameter is now optional (defaults to 6600) +* Can specify bind_to_address multiple times +* New --kill argument for killing MPD if pid_file is specified +* Removed --update-db argument (use the update function in your client instead) +* New mpdconf.example +* New mpd.conf man page +* Removed bundled libmad and libid3tag +* Lots of bug fixes, cleaned up code, and performance improvements + +ver 0.11.5 (2004/11/1) +1) New id3v1_encoding config option to configure the id3v1 tag encoding (patch from dottedmag) +2) Strip '\r' from m3u playlists (thank you windows) +3) Use random() instead of rand() for playlist randomizing +4) Fix a bug trying skipping some commented lines in m3u playlist files +5) Fix a bug when fetching metadata from streams that may cause certain weirdnesses +6) Fix a bug where replaygain preamp was used on files w/o replaygain tags +7) Fix a busy loop when trying to prebuffer a nonexistant or missing stream +8) Fix a bug in forgetting to remove leading ' ' in content-type for http streams +9) Check for ice-name in http headers +10) Be sure the strip all '\n' chars in tags +11) Set $HOME env variable when setuid'ing, this should fix the /root/.mcop errors triggered by arts/libao + +ver 0.11.4 (2004/7/26) +1) Fixed a segfault when decoding mp3's with corrupt id3v2 tags +2) Fixed a memory leak when encountering id3v2 tags in mp3 decoder + +ver 0.11.3 (2004/7/21) +1) Add support for http authentication for streams +2) Added replaygain pre-amp support +3) Better error handling for fread() in inputStream_file +4) Fixed a bug so that when a freeAllInterfaces is called, it sets max_interface_connections to 0. This prevents potential segfaults and other nastiness for forked processes, like the player and update-er (do to interfacePrintWithFD()). +5) Allow blockingWrite() to handle errors more gracefully (for example, if the disc is full, and thus the write() fails or can't be completed, we just skip this write() and continue, instead of getting stuck in an infinite loop until the write() becomes successful) +6) Updated mpdconf.example from sbh/avuton +7) If "user" is specified, then convert ~ in paths to the user's home path specified by "user" config paramter (not the actual current user running mpd). + +ver 0.11.2 (2004/7/5) +1) Work around in computing total time for mp3's whose first valid mpeg frame is not layer III +2) Fix mp3 and mp4 decoders when seeking past the end of the file +3) Fix replaygain for flac and vorbis +4) Fix memory leaks in flac decoder (from normalperson) +5) Fix Several other bugs in playlist.c and directory.c (from normalperson) + +ver 0.11.1 (2004/6/24) +1) Fix a bug that caused "popping" at the beginning of mp3's +2) Fix playlistid command +3) Fix move commands so they don't mess up the song id's +4) Added support for HTTP Proxy +5) Detect and skip recursive links in the music directory +6) Fix addPathToDB() so updating on a specific path doesn't exist correctly adds the parent directories to the DB + +ver 0.11.0 (2004/6/18) +1) Support for playing mp3 and Ogg Vorbis streams +2) Non-blocking Update +3) Replaygain support for Ogg Vorbis and FLAC (by Eric Moore aka AliasMrJones) +4) audio_output_format option that allows for all audio output to be converted to a format compatible with any sound card +5) Own routines for to always support UTF-8 <-> ISO-8859-1 conversion +6) Added "Id" and "Pos" metadata for songs in playlist +7) Added commands: plchanges, currentsong, playid, seekid, playlistid, moveid, swapid, deleteid +8) UTF-8 validation of all tags +9) Update specific files/directories (for fast, incremental updating) +10) Added ACK error codes +11) Mod file support +12) Added command_list_ok_begin +13) Play after stop resumes from last position in the playlist +14) Play while pause resumes playback +15) Better signal handling by mackstann +16) Cleanup decoder interface (now called InputPlugins) +17) --create-db no long starts the daemon +18) --no-daemon outputs to log files +19) --stdout sends output to stdout/stderr +20) Default port is now 6600 +21) Lots of other cleanups and Bugfixes + +ver 0.10.4 (2004/5/26) +1) Fix configure problems on OpenBSD with langinfo and iconv +2) Fix an infinte loop when writing to an interface and it has expired +3) Fix a segfault in decoding flac's +4) Ingore CRC stuff in mp3's since some encoders did not compute the CRC correctly +5) Fix a segfault in processing faulty mp4 metadata + +ver 0.10.3 (2004/4/2) +1) Fix a segfault when a blanck line is sent from a client +2) Fix for loading playlists on platforms where char is unsigned +3) When pausing, release audio device after we say pause is successful (this makes pause appear to not lag) +4) When returning errors for unknown types by player, be sure to copy the filename +5) add --disable-alsa for disabling alsa mixer support +6) Use select() for a portable usleep() +7) For alsa mixer, default to "Master' element, not first element + +ver 0.10.2 (2004/3/25) +1) Add suport for AAC +2) Substitute '\n' with ' ' in tag info +3) Remove empty directories from db +4) Resume from current position in song when using state file +5) Pause now closes the music device, and reopens it on resuming +6) Fix unnecessary big endian byte swapping +7) If locale is "C" or "POSIX", then use ISO-8859-1 as the fs charset +8) Fix a bug where alsa mixer wasn't detecting volume changes +9) For alsa and software mixer, show volume to be the same as it was set (even if its not the exact volume) +10) Report bitrate for wave files +11) Compute song length of CBR mp3's more accurately + +ver 0.10.1 (2004/3/7) +1) Check to see if we need to add "-lm" when linking mpd +2) Fix issues with skipping bad frames in an mp3 (this way we get the correct samplerate and such) +3) Fix crossfading bug with ogg's +4) Updated libmad and libid3tag included w/ source to 0.15.1b + +ver 0.10.0 (2004/3/3) +1) Use UTF-8 for all client communications +2) Crossfading support +3) Password Authentication (all in plaintext) +4) Software mixer +5) Buffer Size is configurable +6) Reduced Memory consumption (use directory tree for search and find) +7) Bitrate support for Flac +8) setvol command (deprecates volume command) +9) add command takes directories +10) Path's in config file now work with ~ +11) Add samplerate,bits, and channels to status +12) Reenable playTime in stats display +13) Fix a segfault when doing: add "" +14) Fix a segfault with flac vorbis comments simply being "=" +15) Fix a segfault/bug in queueNextSong with repeat+random +16) Fix a bug, where one process may segfault, and cause more processes to spawn w/o killing ones that lost their parent. +17) Fix a bug when the OSS device was unable to fetch the current volume, +it would close the device (when it maybe previously closed by the exact same code) +18) command.c cleanup by mackstann +19) directory.c and command.c cleanup by tw-nym + +ver 0.9.4 (2004/1/21) +1) Fix a bug where updated tag info wasn't being detected +2) Set the default audio write size to 1024 bytes (should decrease cpu load a bit on some machines). +3) Make audio write size configurable via "audio_write_size" config option +4) Tweak output buffer size for connections by detecting the kernel output buffer size. + +ver 0.9.3 (2003/10/31) +1) Store total time/length of songs in db and display in *info commands +2) Display instantaneous bitrate in status command +3) Add Wave Support using libaudiofile (Patch from normalperson) +4) Command code cleanup (Patch from tw-nym) +5) Optimize listing of playlists (10-100x faster) +6) Optimize interface output (write in 4kB chunks instead of on every '\n') +7) Fix bug that prevented rm command from working +8) Fix bug where deleting current song skips the next song +9) Use iconv to convert vorbis comments from UTF-8 to Latin1 + +ver 0.9.2 (2003/10/6) +1) Fix FreeBSD Compilation Problems +2) Fix bug in move command +3) Add mixer_control options to configure which mixer control/device mpd controls +4) Randomize on play -1 +5) Fix a bug in toggling repeat off and at the end of the playlist + +ver 0.9.1 (2003/9/30) +1) Fix a statement in the middle of declarations in listen.c, causes error for +gcc 2.7 + +ver 0.9.0 (2003/9/30) +1) Random play mode +2) Alsa Mixer Support +3) Save and Restore "state" +4) Default config file locations (.mpdconf and /etc/mpd.conf) +5) Make db file locations configurable +6) Move songs around in the playlist +7) Gapless playback +8) Use Xing tags for mp3's +9) Remove stop_on_error +10) Seeking support +11) Playlists can be loaded and deleted from subdirectories +12) Complete rewrite of player layer (fork()'s only once, opens and closes +audio device as needed). +13) Eliminate use and dependence of SIGIO +14) IPv6 support +15) Solaris compilations fixes +16) Support for different log levels +17) Timestamps for log entries +18) "user" config parameter for setuid (patch from Nagilum) +19) Other misc features and bug fixes + +ver 0.8.7 (2003/9/3) +1) Fix a memory leak. When closing a interface, was called close() on the fd +instead of calling fclose() on the fp that was opened with fdopen(). + +ver 0.8.6 (2003/8/25) +1) Fix a memory leak when a buffered existed, and a connection was unexpectedly closed, and i wasn't free'ing the buffer apropriatly. + +ver 0.8.5 (2003/8/17) +1) Fix a bug where an extra end of line is returned when attempting to play a +non existing file. This causes parsing errors for clients. + +ver 0.8.4 (2003/8/13) +1) Fix a bug where garbage is returned with errors in "list" command + +ver 0.8.3 (2003/8/12) +1) Fix a compilation error on older linux systems +2) Fix a bug in searching by title +3) Add "list" command +4) Add config options for specifying libao driver/plugin and options +5) Add config option to specify which address to bind to +6) Add support for loading and saving absolute pathnames in saved playlists +7) Playlist no longer creates duplicate entries for song data (more me +efficient) +8) Songs deleted from the db are now removed for the playlist as well + +ver 0.8.2 (2003/7/22) +1) Increased the connection que for listen() from 0 to 5 +2) Cleanup configure makefiles so that mpd uses MPD_LIBS and MPD_CFLAGS +rather than LIBS and CFLAGS +3) Put a cap on the number of commands per command list +4) Put a cap on the maximum number of buffered output lines +5) Get rid of TIME_WAIT/EADDRINUSE socket problem +6) Use asynchronious IO (i.e. trigger SIGIO instead so we can sleep in +select() calls longer) + +ver 0.8.1 (2003/7/11) +1) FreeBSD fixes +2) Fix for rare segfault when updating +3) Fix bug where client was being hungup on when done playing current song +4) Fix bug when playing flac's where it incorrectly reports an error +5) Make stop playlist on error configurable +6) Configure checks for installed libmad and libid3tag and uses those if found +7) Use buffer->finished in *_decode's instead of depending on catching signals + +ver 0.8.0 (2003/7/6) +1) Flac support +2) Make playlist max length configurable +3) New backward compatible status (backward compatible for 0.8.0 on) +4) listall command now can take a directory as an argument +5) Buffer rewritten to use shared memory instead of sockets +6) Playlist adding done using db +7) Add sort to list, and use binary search for finding +8) New "stats" command +9) Command list (for faster adding of large batches of files) +10) Add buffered chunks before play +11) Useful error reporting to clients (part of status command) +12) Use libid3tag for reading id3 tags (more stable) +13) Non-blocking output to clients +14) Fix bug when removing items from directory +15) Fix bug when playing mono mp3's +16) Fix bug when attempting to delete files when using samba +17) Lots of other bug fixes I can't remember + +ver 0.7.0 (2003/6/20) +1) use mad instead of mpg123 for mp3 decoding +2) volume support +3) repeate playlist support +4) use autoconf/automake (i.e. "configure") +5) configurable max connections + +ver 0.6.2 (2003/6/11) +1) Buffer support for ogg +2) new config file options: "connection_timeout" and "mpg123_ignore_junk" +3) new commands: "next", "previous", and "listall" +Thanks to Niklas Hofer for "next" and "previous" patches! +4) Search by filename +5) bug fix for pause when playing mp3's + +ver 0.6.1 (2003/5/29) +1) Add conf file support +2) Fix a bug when doing mp3stop (do wait3(NULL,WNOHANG|WUNTRACED,NULL)) +3) Fix a bug when fork'ing, fflush file buffers before forking so the +child doesn't print the same stuff in the buffer. + +ver 0.6.0 (2003/5/25) +1) Add ogg vorbis support +2) Fix two bugs relating to tables, one for search by title, and one where we +freed the tables before directories, causing a segfault +3) The info command has been removed. + +ver 0.5.0-0.5.2 +Initial release(s). Support for MP3 via mpg123 diff --git a/.svn/text-base/INSTALL.svn-base b/.svn/text-base/INSTALL.svn-base new file mode 100644 index 0000000..e0bc9e5 --- /dev/null +++ b/.svn/text-base/INSTALL.svn-base @@ -0,0 +1,131 @@ + Music Player Daemon (MPD) - INSTALL + +Optional Output Dependencies +---------------------------- + +You will need at least one of these to compile MPD. + +Most of these are available as packages on major distributions. Be sure to +install both the library package as well as the development package. + +AO - http://www.xiph.org/ao/ +A portable library that abstracts many audio output types as one API. Should +be used only if there is no native plugin available or if the native plugin +doesn't work. You will need libao. + +ALSA - http://www.alsa-project.org/ +The Advanced Linux Sound Architecture. Recommended audio output if you use +Linux. You will need libasound. + +PulseAudio - http://www.pulseaudio.org/ +An advanced sound daemon. You will need libpulse. + +JACK - http://www.jackaudio.org/ +A low-latency sound daemon. + +libshout - http://www.icecast.org/ +For streaming to an Icecast or Shoutcast server. + +Optional Input Dependencies +--------------------------- + +You will need at least one of these to compile MPD. + +Most of these are available as packages on major distributions. Be sure to +install both the library package as well as the development package. + +MAD - http://www.underbit.com/products/mad/ +For MP3 support. You will need libmad, and optionally libid3tag if you want +ID3 tag support. + +Ogg Vorbis - http://www.xiph.org/ogg/vorbis/ +For Ogg Vorbis support. You will need libogg and libvorbis. + +FLAC - http://flac.sourceforge.net/ +For FLAC support. You will need version 1.1.0 or higher of libflac. + +OggFLAC - http://www.xiph.org/ogg/vorbis/ and http://flac.sourceforge.net/ +For OggFLAC support. You will need liboggflac, which can be built from the +FLAC sources if libogg is already installed. Versions of flac 1.1.3 and +greater will automatically detect and use OggFLAC if it's available. + +Audio File - http://www.68k.org/~michael/audiofile/ +For WAVE, AIFF, and AU support. You will need libaudiofile. + +FAAD2 - http://www.audiocoding.com/ +For MP4/AAC support. You will need libmp4ff. + +libmpcdec - http://www.musepack.net/ +For Musepack support. + +MikMod - http://mikmod.raphnet.net/ +For MOD support. You will need libmikmod. + +Optional Miscellaneous Dependencies +----------------------------------- + +Avahi - http://www.avahi.org/ +For Zeroconf support. + +libsamplerate - http://www.mega-nerd.com/SRC/ +For advanced samplerate conversions. + +Download +-------- + +Get the latest release from of MPD from . + +Compile +------- + +1) unzip and untar the archive + +$ tar zxvf mpd-x.x.x.tar.gz + +or + +$ tar jxvf mpd-x.x.x.tar.bz2 + +2) change to directory created + +$ cd mpd-x.x.x + +3) Run configure script (this will determine what dependencies you have) + +$ ./configure + +4) Compile + +$ make + +Install (Optional) +------- + +(as root) +$ make install + +Run +--- + +1) run mpd: + +$ mpd + +(if no config file is specified, mpd's looks for ~/.mpdconf then /etc/mpd.conf) + +an example would be: + +$ mpd playlists/.mpdconf + +A sample config file is included with the source of MPD, mpdconf.example . + +Note: The first time you run mpd, it will "explore" your mp3 directory for +mp3's. + +Using MPD +--------- + +You can download many different interfaces for MPD at + + +MPD can be interfaced directly using telnet (see COMMANDS, if you are brave). diff --git a/.svn/text-base/Makefile.am.svn-base b/.svn/text-base/Makefile.am.svn-base new file mode 100644 index 0000000..952d427 --- /dev/null +++ b/.svn/text-base/Makefile.am.svn-base @@ -0,0 +1,9 @@ +AUTOMAKE_OPTIONS = foreign 1.6 + +SUBDIRS = src doc +docdir = $(prefix)/share/doc/$(PACKAGE) +doc_DATA = README UPGRADING +EXTRA_DIST = COPYING $(doc_DATA) + +sparse-check: + $(MAKE) -C src $@ diff --git a/.svn/text-base/PATCHES.svn-base b/.svn/text-base/PATCHES.svn-base new file mode 100644 index 0000000..3324df2 --- /dev/null +++ b/.svn/text-base/PATCHES.svn-base @@ -0,0 +1,3 @@ +Following patches are applied: +* 1478 +* 1520 diff --git a/.svn/text-base/README.svn-base b/.svn/text-base/README.svn-base new file mode 100644 index 0000000..b403dd3 --- /dev/null +++ b/.svn/text-base/README.svn-base @@ -0,0 +1,22 @@ + + Music Player Daemon (MPD) + http://www.musicpd.org + +A daemon for playing music of various formats. Music is played through the +server's audio device. The daemon stores info about all available music, +and this info can be easily searched and retrieved. Player control, info +retrieval, and playlist management can all be managed remotely. + +To install MPD, see INSTALL. + +MPD includes mp4ff in the source, due to licensing issues of the newer +version and includes bugfixes with the properly licensed version. mp4ff is +released under the GPL and copyrighted by M. Bakker, Ahead Software AG +(http://www.nero.com) and is distributed as a part of the FAAD2 - Freeware +Advance Audio (AAC) Decoder. + +MPD is released under the GNU Public License. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +For the full license, see COPYING. diff --git a/.svn/text-base/TODO.svn-base b/.svn/text-base/TODO.svn-base new file mode 100644 index 0000000..f652d4f --- /dev/null +++ b/.svn/text-base/TODO.svn-base @@ -0,0 +1,83 @@ +0.14 +---- + +*) data structures + *) remove changes made to linked list for TagTracker + +*) input plugins + *) add support for playing aac streams + +*) mixer + *) add sun support + *) add OS X support + +*) Add support for 24-bit audio + +*) cleanup linked list code! + +*) implement listener socket protocol as documented here: + http://mpd.wikia.com/wiki/MusicPlayerDaemonListenerProtocol + +*) support for dynamically loading plugins + *) cleanup input plugins "API" + *) cleanup output plugins "API" + +*) add error codes for status->error + +*) Cleanup Config File Code + +*) audio output + *) write a esd native audioOutput + *) write a nas native audioOutput + *) allowing "pausing" of audio output devices + *) while pausing, play silence for the devices that don't support + "pausing" + *) write a sun native audioOutput + *) more accurate time reporting by determining how much of audio_device + buffer has been played + +*) state + *) abstract out state code from playlist.c + *) put MPD Version in statefile + +*) add playlistreplace command (replace current playlist with saved playlist + and keep playing) + +*) add command for inserting songs in a specific position + +1.0 +--- + +*) bug fixes + +post-1.0 +-------- + +*) rewrite audio pipe + *) use pthreads/clone + *) try to constrain the use of pthread mutex's and condition's + to specific output plugins + *) use pull model for audio_output + *) threads + 0) managing thread + *) receives commands + *) manages state + *) handles time/metadata sending + 1) decoding thread + 2) effects thread + *) crossfading + *) *command* resampling/conversions + 3) audio_output thread + *) thread for each audio_output device + +*) dynamic metadata + *) implement by recording the ftell positions of entries + *) buffer changes and flush them once every 60 seconds + *) buffer changes while doing an update + *) be sure to check that the metadata "header" is what we expect + before writing at the position + *) add support for: + *) last time played + *) times played + *) times skipped + *) ranking diff --git a/.svn/text-base/UPGRADING.svn-base b/.svn/text-base/UPGRADING.svn-base new file mode 100644 index 0000000..b25beab --- /dev/null +++ b/.svn/text-base/UPGRADING.svn-base @@ -0,0 +1,84 @@ + Music Player Daemon (MPD) - UPGRADING + +Upgrading to 0.13.0 +------------------- + +JACK, Avahi, and libsamplerate have been added as optional dependencies. +FLAC/OggFLAC now supports the 1.1.3 API, and libmikmod 3.2.0 betas are +supported as well. + +New mpd.conf parameters include zeroconf_name, samplerate_converter, and +gapless_mp3_playback. See the mpd.conf man page or updated mpconf.example for +more information on these parameters. + +Support for the ID3v2 "Original Artist/Performer" tag has been added. Your +MP3s will need to be rescanned for these tags to be included in the database. +This can be done by running mpd --create-db. + +Upgrading to 0.12.0 +------------------- + +The ao_driver and ao_driver_options config parameters have been removed and +replaced with the audio_output config section. You will have to update your +config file to use this instead. See the mpd.conf man page or the new +mpdconf.example for details on specifying audio_output sections. + +The db_file parameter is no longer optional. If you did not specify it in your +old config file then you will have to add it in order to run 0.12.0. + +Support for OggFLAC and Musepack audio files has been added. Additionally, +scanning of MP3 files has been improved. To make use of these updates it is +highly recommended that you run mpd --create-db to recreate your entire +database. + +Upgrading to 0.11.0 +------------------- + +The database format has changed a little bit, but in a backward compatible way. +This means that if you upgrade to 0.11.0 from 0.10.x, you do not need to make +any changes. However, if you downgrade back to 0.10.x, then you will need +to recreate your db. + +The default port for MPD is now 6600, so update your mpd and client +configurations appropriately. + +Upgrading to 0.10.0 +------------------- + +All information is now stored in the db in UTF-8 format, and the character +set used for the filesystem is stored in the db. Thus, it is highly +recommended that you recreate the db. To do so, run mpd with the +"--create-db" command line option. Also, note that the filesystem +character set will be determined from your current locale settings. +If your locale settings are not the same as those used for the filesystem, +then use the config file parameter "filesystem_charset" to specify the +correct character set (this maybe necessary if you create the db with root). + +Upgrading to 0.9.3 +------------------ + +Wave support was added, so to have your wave files added, update the db (mpc +update). + +Also, song lengths are now stored in the db. To get this stuff +added to the db, you will need to recreate the db from scratch. To do this, +run mpd with the "--create-db" commandline option. + +Upgrading to 0.9.0 +------------------ + +The "stop_on_error" config parameter was removed, so be sure to remove this +parameter from your config file. + +Upgrading to 0.8.x +------------------ + +If you have FLACs, then to have them added to your list of available music, +just use "update". + +Upgrading from 0.5.x to 0.6.x +----------------------------- +If you have not compiled MPD with "make ogg", then nothing is needed. + +If you compiled with "make ogg", just use "update" (available via the phpMp +interface) to add your OGGs to MPD's list of available music. diff --git a/.svn/text-base/autogen.sh.svn-base b/.svn/text-base/autogen.sh.svn-base new file mode 100644 index 0000000..34dbf34 --- /dev/null +++ b/.svn/text-base/autogen.sh.svn-base @@ -0,0 +1,163 @@ +#!/bin/sh +# Run this to set up the build system: configure, makefiles, etc. +# (at one point this was based on the version in enlightenment's cvs) + +package="mpd" + +olddir="`pwd`" +srcdir="`dirname $0`" +test -z "$srcdir" && srcdir=. +cd "$srcdir" +DIE= +AM_VERSIONGREP="sed -e s/.*[^0-9\.]\([0-9]\.[0-9]\).*/\1/" +AC_VERSIONGREP="sed -e s/.*[^0-9\.]\([0-9]\.[0-9][0-9]\).*/\1/" +VERSIONMKINT="sed -e s/[^0-9]//" +if test -n "$AM_FORCE_VERSION" +then + AM_VERSIONS="$AM_FORCE_VERSION" +else + AM_VERSIONS='1.6 1.7 1.8 1.9' +fi +if test -n "$AC_FORCE_VERSION" +then + AC_VERSIONS="$AC_FORCE_VERSION" +else + AC_VERSIONS='2.58 2.59' +fi + +versioned_bins () +{ + bin="$1" + needed_int=`echo $VERNEEDED | $VERSIONMKINT` + for i in $VERSIONS + do + i_int=`echo $i | $VERSIONMKINT` + if test $i_int -ge $needed_int + then + echo $bin-$i $bin$i $bin-$i_int $bin$i_int + fi + done + echo $bin +} + +for c in autoconf autoheader automake aclocal +do + uc=`echo $c | tr a-z A-Z` + eval "val=`echo '$'$uc`" + if test -n "$val" + then + echo "$uc=$val in environment, will not attempt to auto-detect" + continue + fi + + case "$c" in + autoconf|autoheader) + VERNEEDED=`fgrep AC_PREREQ configure.ac | $AC_VERSIONGREP` + VERSIONS="$AC_VERSIONS" + pkg=autoconf + ;; + automake|aclocal) + VERNEEDED=`fgrep AUTOMAKE_OPTIONS Makefile.am | $AM_VERSIONGREP` + VERSIONS="$AM_VERSIONS" + pkg=automake + ;; + esac + printf "checking for $c ... " + for x in `versioned_bins $c`; do + ($x --version < /dev/null > /dev/null 2>&1) > /dev/null 2>&1 + if test $? -eq 0 + then + echo $x + eval $uc=$x + break + fi + done + eval "val=`echo '$'$uc`" + if test -z "$val" + then + if test $c = $pkg + then + DIE="$DIE $c=$VERNEEDED" + else + DIE="$DIE $c($pkg)=$VERNEEDED" + fi + fi +done + +if test -n "$LIBTOOLIZE" +then + echo "LIBTOOLIZE=$LIBTOOLIZE in environment," \ + "will not attempt to auto-detect" +else + printf "checking for libtoolize ... " + for x in libtoolize glibtoolize + do + ($x --version < /dev/null > /dev/null 2>&1) > /dev/null 2>&1 + if test $? -eq 0 + then + echo $x + LIBTOOLIZE=$x + break + fi + done +fi + +if test -z "$LIBTOOLIZE" +then + DIE="$DIE libtoolize(libtool)" +fi + +if test -n "$DIE" +then + echo "You must have the following installed to compile $package:" + for i in $DIE + do + printf ' ' + echo $i | sed -e 's/(/ (from /' -e 's/=\(.*\)/ (>= \1)/' + done + echo "Download the appropriate package(s) for your system," + echo "or get the source from one of the GNU ftp sites" + echo "listed in http://www.gnu.org/order/ftp.html" + exit 1 +fi + +echo "Generating configuration files for $package, please wait...." + +ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $PWD/m4" + +# /usr/share/aclocal is most likely included by default, already... +ac_local_paths=' +/usr/local/share/aclocal +/sw/share/aclocal +/usr/pkg/share/aclocal +/opt/share/aclocal +/usr/gnu/share/aclocal +' + +for i in $ac_local_paths; do + if test -d "$i"; then + ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $i" + # we probably only want one of these... + break + fi +done + +echo " $ACLOCAL $ACLOCAL_FLAGS" +$ACLOCAL $ACLOCAL_FLAGS || exit 1 + +echo " $AUTOHEADER" +$AUTOHEADER || exit 1 + +echo " $LIBTOOLIZE --automake" +$LIBTOOLIZE --automake || exit 1 + +echo " $AUTOMAKE --add-missing $AUTOMAKE_FLAGS" +$AUTOMAKE --add-missing $AUTOMAKE_FLAGS || exit 1 + +echo " $AUTOCONF" +$AUTOCONF || exit 1 + +cd "$olddir" +if test x$NOCONFIGURE = x; then + "$srcdir"/configure "$@" || exit 1 +fi diff --git a/.svn/text-base/configure.ac.svn-base b/.svn/text-base/configure.ac.svn-base new file mode 100644 index 0000000..6753dc9 --- /dev/null +++ b/.svn/text-base/configure.ac.svn-base @@ -0,0 +1,816 @@ +dnl AC_INIT(src/main.c) +dnl AM_INIT_AUTOMAKE(mpd, 0.14.0) + +AC_PREREQ(2.60) +AC_INIT(mpd, 0.14.0, warren.dukes@gmail.com) +AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION) + +AC_SUBST(MPD_LIBS) +AC_SUBST(MPD_CFLAGS) +AC_SUBST(MP4FF_LIB) +AC_SUBST(MP4FF_SUBDIR) + +AC_PROG_CC +AM_PROG_CC_C_O +AC_PROG_INSTALL +AC_PROG_LIBTOOL +AC_PROG_MAKE_SET + +AM_CONFIG_HEADER(config.h) +AC_DEFINE(PROTOCOL_VERSION, "0.14.0", [The mpd protocol version]) + +MPD_LIBS="" +MPD_CFLAGS="" +if test x$GCC = xyes; then + MPD_CFLAGS="-Wall -Wmissing-prototypes" +fi + +if test -z "$prefix" || test "x$prefix" = xNONE; then + local_lib= + local_include= + + # aren't autotools supposed to be smart enough to figure this out? oh + # well, the git-core Makefile managed to do some of the work for us :) + case "$host_os" in + darwin*) + local_lib='/sw/lib /opt/local/lib' + local_include='/sw/include /opt/local/include' + ;; + freebsd* | openbsd*) + local_lib=/usr/local/lib + local_include=/usr/local/include + ;; + netbsd*) + local_lib=/usr/pkg/lib + local_include=/usr/pkg/include + LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/pkg/lib" + ;; + esac + + for d in $local_lib; do + if test -d "$d"; then + LDFLAGS="$LDFLAGS -L$d" + break + fi + done + for d in $local_include; do + if test -d "$d"; then + CFLAGS="$CFLAGS -I$d" + break + fi + done +fi + +AC_ARG_ENABLE(ao,[ --enable-ao enable support for libao (default: disable)],[enable_ao=$enableval],[enable_ao=no]) +AC_ARG_ENABLE(shout,[ --disable-shout disable support for streaming through shout (default: enable)],[enable_shout=$enableval],[enable_shout=yes]) +AC_ARG_ENABLE(iconv,[ --disable-iconv disable iconv support (default: enable)],[enable_iconv=$enableval],[enable_iconv=yes]) +AC_ARG_ENABLE(ipv6,[ --disable-ipv6 disable IPv6 support (default: enable)],[enable_ipv6=$enableval],[enable_ipv6=yes]) +AC_ARG_ENABLE(oss,[ --disable-oss disable OSS support (default: enable)],[enable_oss=$enableval],[enable_oss=yes]) +AC_ARG_ENABLE(alsa,[ --disable-alsa disable ALSA support (default: enable)],[enable_alsa=$enableval],[enable_alsa=yes]) +AC_ARG_ENABLE(jack,[ --disable-jack disable jack support (default: enable)],[enable_jack=$enableval],[enable_jack=yes]) +AC_ARG_ENABLE(pulse,[ --disable-pulse disable support for the PulseAudio sound server (default: enable)],[enable_pulse=$enableval],[enable_pulse=yes]) +AC_ARG_ENABLE(fifo,[ --disable-fifo disable support for writing audio to a FIFO (default: enable)],[enable_fifo=$enableval],[enable_fifo=yes]) +AC_ARG_ENABLE(mvp,[ --enable-mvp enable support for Hauppauge Media MVP (default: disable)],[enable_mvp=$enableval],[enable_mvp=no]) +AC_ARG_ENABLE(oggvorbis,[ --disable-oggvorbis disable Ogg Vorbis support (default: enable)],[enable_oggvorbis=$enableval],enable_oggvorbis=yes) +AC_ARG_ENABLE(oggflac,[ --disable-oggflac disable OggFLAC support (default: enable)],[enable_oggflac=$enableval],enable_oggflac=yes) +AC_ARG_ENABLE(flac,[ --disable-flac disable flac support (default: enable)],[enable_flac=$enableval],[enable_flac=yes]) +AC_ARG_ENABLE(mp3,[ --disable-mp3 disable mp3 support (default: enable)],[enable_mp3=$enableval],[enable_mp3=yes]) +AC_ARG_ENABLE(aac,[ --disable-aac disable AAC support (default: enable)],[enable_aac=$enableval],[enable_aac=yes]) +AC_ARG_ENABLE(audiofile,[ --disable-audiofile disable audiofile support, disables wave support (default: enable)],[enable_audiofile=$enableval],[enable_audiofile=yes]) +AC_ARG_ENABLE(mod,[ --enable-mod enable MOD support (default: disable)],[enable_mod=$enableval],[enable_mod=yes]) +AC_ARG_ENABLE(mpc,[ --disable-mpc disable musepack (MPC) support (default: enable)],[enable_mpc=$enableval],[enable_mpc=yes]) +AC_ARG_ENABLE(wavpack,[ --disable-wavpack disable WavPack support (default: enable)],[enable_wavpack=$enableval],[enable_wavpack=yes]) +AC_ARG_ENABLE(id3,[ --disable-id3 disable id3 support (default: enable)],[enable_id3=$enableval],[enable_id3=yes]) +AC_ARG_ENABLE(lsr,[ --disable-lsr disable libsamplerate support (default: enable)],[enable_lsr=$enableval],[enable_lsr=yes]) + +AC_ARG_WITH(tremor,[[ --with-tremor[=PFX] Use Tremor(vorbisidec) integer Ogg-Vorbis decoder (with optional prefix)]], use_tremor=yes; test x$withval != xyes && tremor_prefix="$withval",) +AC_ARG_WITH(tremor-libraries,[ --with-tremor-libraries=DIR Directory where Tremor library is installed (optional)], tremor_libraries="$withval", tremor_libraries="") +AC_ARG_WITH(tremor-includes,[ --with-tremor-includes=DIR Directory where Tremor header files are installed (optional)], tremor_includes="$withval", tremor_includes="") + +AC_ARG_WITH(iconv,[ --with-iconv=PFX Prefix where iconv is installed (optional)], iconv_prefix="$withval", iconv_prefix="") +AC_ARG_WITH(iconv-libraries,[ --with-iconv-libraries=DIR Directory where libiconv library is installed (optional)], iconv_libraries="$withval", iconv_libraries="") +AC_ARG_WITH(iconv-includes,[ --with-iconv-includes=DIR Directory where libiconv header files are installed (optional)], iconv_includes="$withval", iconv_includes="") + +AC_ARG_WITH(id3tag,[ --with-id3tag=PFX Prefix where libid3tag is installed (optional)], id3tag_prefix="$withval", id3tag_prefix="") +AC_ARG_WITH(id3tag-libraries,[ --with-id3tag-libraries=DIR Directory where libid3tag library is installed (optional)], id3tag_libraries="$withval", id3tag_libraries="") +AC_ARG_WITH(id3tag-includes,[ --with-id3tag-includes=DIR Directory where libid3tag header files are installed (optional)], id3tag_includes="$withval", id3tag_includes="") + +AC_ARG_WITH(mad,[ --with-mad=PFX Prefix where libmad is installed (optional)], mad_prefix="$withval", mad_prefix="") +AC_ARG_WITH(mad-libraries,[ --with-mad-libraries=DIR Directory where libmad library is installed (optional)], mad_libraries="$withval", mad_libraries="") +AC_ARG_WITH(mad-includes,[ --with-mad-includes=DIR Directory where mad header files are installed (optional)], mad_includes="$withval", mad_includes="") + +AC_ARG_WITH(faad,[ --with-faad=PFX Prefix where faad2 is installed], faad_prefix="$withval", faad_prefix="") +AC_ARG_WITH(faad-libraries,[ --with-faad-libraries=DIR Directory where faad2 library is installed (optional)], faad_libraries="$withval", faad_libraries="") +AC_ARG_WITH(faad-includes,[ --with-faad-includes=DIR Directory where faad2 header files are installed (optional)], faad_includes="$withval", faad_includes="") +AC_ARG_WITH(zeroconf,[[ --with-zeroconf=[auto|avahi|bonjour|no] Enable zeroconf backend (default=auto)]], with_zeroconf="$withval", with_zeroconf="auto") + +AC_ARG_WITH(lsr,[ --with-src=PFX Prefix where libsamplerate is installed], src_prefix="$withval", src_prefix="") +AC_ARG_WITH(lsr-libraries,[ --with-lsr-libraries=DIR Directory where libsamplerate library is installed (optional)], lsr_libraries="$withval", lsr_libraries="") +AC_ARG_WITH(lsr-includes,[ --with-lsr-includes=DIR Directory where libsamplerate header files are installed (optional)], lsr_includes="$withval", lsr_includes="") + +AC_C_BIGENDIAN + +AC_CHECK_SIZEOF(short) +AC_CHECK_SIZEOF(int) +AC_CHECK_SIZEOF(long) +AC_CHECK_SIZEOF(long long) + +AC_CHECK_HEADER(sys/inttypes.h,AC_DEFINE(HAVE_SYS_INTTYPES_H,1,[Define if sys/inttypes.h present]),) + +AC_TYPE_INT64_T +AC_TYPE_UINT64_T + +AC_CHECK_LIB(socket,socket,MPD_LIBS="$MPD_LIBS -lsocket",) +AC_CHECK_LIB(nsl,gethostbyname,MPD_LIBS="$MPD_LIBS -lnsl",) + +AC_CHECK_LIB(m,exp,MPD_LIBS="$MPD_LIBS -lm",) +AC_CHECK_FUNCS(setenv) + + +dnl doesn't work for systems that don't have CODESET like OpenBSD +dnl AC_CHECK_HEADER(langinfo.h,[enable_langinfo=yes;AC_DEFINE(HAVE_LANGINFO,1,[Define if nl_langinfo.h is present])],enable_langinfo=no) +AM_LANGINFO_CODESET +AC_CHECK_HEADER(locale.h,[enable_locale=yes;AC_DEFINE(HAVE_LOCALE,1,[Define if locale.h is present])],enable_locale=no) + +if test x$enable_ipv6 = xyes; then + AC_MSG_CHECKING(for ipv6) + AC_EGREP_CPP([AP_maGiC_VALUE], + [ +#include +#include +#include +#ifdef PF_INET6 +#ifdef AF_INET6 +AP_maGiC_VALUE +#endif +#endif + ], + AC_DEFINE(HAVE_IPV6, 1, [Define if IPv6 support present]) + AC_MSG_RESULT([yes]), + AC_MSG_RESULT([no]) +) +fi + +enable_osx=no +case $host in + *-darwin*) + AC_DEFINE(HAVE_OSX, 1, [Define for compiling OS X support]) + MPD_LIBS="$MPD_LIBS -framework AudioUnit -framework CoreServices" + enable_osx=yes ;; +esac + +if test x$enable_shout = xyes; then + if test x$enable_oggvorbis = xno; then + AC_MSG_WARN([disabling shout streaming support because vorbis is not enabled]) + enable_shout=no + fi + if test x$use_tremor = xyes; then + AC_MSG_WARN([disabling shout streaming support because tremor does not support vorbis encoding]) + enable_shout=no + fi +fi + +if test x$enable_ao = xyes; then + XIPH_PATH_AO([AC_DEFINE(HAVE_AO, 1, [Define to play with ao]) MPD_LIBS="$MPD_LIBS $AO_LIBS" MPD_CFLAGS="$MPD_CFLAGS $AO_CFLAGS"], enable_ao=no) +fi + +if test x$enable_shout = xyes; then + XIPH_PATH_SHOUT([AC_DEFINE(HAVE_SHOUT, 1, [Define to enable libshout support]) MPD_LIBS="$MPD_LIBS $SHOUT_LIBS" MPD_CFLAGS="$MPD_CFLAGS $SHOUT_CFLAGS"], enable_shout=no) +fi + +if test x$enable_oss = xyes; then + AC_CHECK_HEADER(sys/soundcard.h,[enable_oss=yes;AC_DEFINE(HAVE_OSS,1,[Define to enable OSS])],[AC_MSG_WARN(Soundcard headers not found -- disabling OSS support);enable_oss=no]) +fi + +PKG_PROG_PKG_CONFIG + +if test x$enable_pulse = xyes; then + PKG_CHECK_MODULES([PULSE], [libpulse-simple], + [enable_pulse=yes;AC_DEFINE([HAVE_PULSE], 1, [Define to enable PulseAudio support])] MPD_LIBS="$MPD_LIBS $PULSE_LIBS" MPD_CFLAGS="$MPD_CFLAGS $PULSE_CFLAGS", + [enable_pulse=no;AC_MSG_WARN([PulseAudio not found -- disabling])]) +fi + +if test x$enable_lsr = xyes; then + PKG_CHECK_MODULES([SAMPLERATE], [samplerate >= 0.0.15], + [enable_lsr=yes;AC_DEFINE([HAVE_LIBSAMPLERATE], 1, [Define to enable libsamplerate])] MPD_LIBS="$MPD_LIBS $SAMPLERATE_LIBS" MPD_CFLAGS="$MPD_CFLAGS $SAMPLERATE_CFLAGS", + [enable_lsr=no;AC_MSG_WARN([libsamplerate not found -- disabling])]) +fi + +if test x$enable_fifo = xyes; then + AC_CHECK_FUNC([mkfifo], + [enable_fifo=yes;AC_DEFINE([HAVE_FIFO], 1, [Define to enable support for writing audio to a FIFO])], + [enable_fifo=no;AC_MSG_WARN([mkfifo not found -- disabling support for writing audio to a FIFO])]) +fi + +if test x$enable_mvp = xyes; then + AC_DEFINE(HAVE_MVP,1,[Define to enable Hauppauge Media MVP support]) +fi + +if test x$enable_alsa = xyes; then + AM_PATH_ALSA(0.9.0,[AC_DEFINE(HAVE_ALSA,1,[Define to enable ALSA support]) MPD_LIBS="$MPD_LIBS $ALSA_LIBS" MPD_CFLAGS="$MPD_CFLAGS $ALSA_CFLAGS"],enable_alsa=no) +fi + +if test x$enable_jack = xyes; then + PKG_CHECK_MODULES([JACK], [jack >= 0.4], + [enable_jack=yes;AC_DEFINE([HAVE_JACK], 1, [Define to enable JACK support])] MPD_LIBS="$MPD_LIBS $JACK_LIBS" MPD_CFLAGS="$MPD_CFLAGS $JACK_CFLAGS", + [enable_jack=no;AC_MSG_WARN([JACK not found -- disabling])]) +fi + +if test x$enable_iconv = xyes; then + if test "x$iconv_libraries" != "x" ; then + ICONV_LIBS="-L$iconv_libraries" + elif test "x$iconv_prefix" != "x" ; then + ICONV_LIBS="-L$iconv_prefix/lib" + fi + + ICONV_LIBS="$ICONV_LIBS -liconv" + + if test "x$iconv_includes" != "x" ; then + ICONV_CFLAGS="-I$iconv_includes" + elif test "x$iconv_prefix" != "x" ; then + ICONV_CFLAGS="-I$iconv_prefix/include" + fi + + oldcflags=$CFLAGS + oldlibs=$LIBS + oldcppflags=$CPPFLAGS + CFLAGS="$CFLAGS $MPD_CFLAGS $ICONV_CFLAGS" + LIBS="$LIBS $MPD_LIBS $ICONV_LIBS" + CPPFLAGS=$CFLAGS + AC_CHECK_HEADER(iconv.h,MPD_CFLAGS="$MPD_CFLAGS $ICONV_CFLAGS",enable_iconv=no) + if test x$enable_iconv = xyes; then + AC_CHECK_LIB(iconv,main,MPD_LIBS="$MPD_LIBS $ICONV_LIBS",) + AC_DEFINE(HAVE_ICONV,1,[Define to use iconv]) + fi + CFLAGS=$oldcflags + LIBS=$oldlibs + CPPFLAGS=$oldcppflags +fi + +ID3_SUBDIR="" + +if test x$enable_id3 = xyes; then + if test "x$id3tag_libraries" != "x" ; then + ID3TAG_LIBS="-L$id3tag_libraries" + elif test "x$id3tag_prefix" != "x" ; then + ID3TAG_LIBS="-L$id3tag_prefix/lib" + fi + + ID3TAG_LIBS="$ID3TAG_LIBS -lid3tag -lz" + + if test "x$id3tag_includes" != "x" ; then + ID3TAG_CFLAGS="-I$id3tag_includes" + elif test "x$id3tag_prefix" != "x" ; then + ID3TAG_CFLAGS="-I$id3tag_prefix/include" + fi + + ID3TAG_CFLAGS="$ID3TAG_CFLAGS" + + oldcflags=$CFLAGS + oldlibs=$LIBS + oldcppflags=$CPPFLAGS + CFLAGS="$CFLAGS $MPD_CFLAGS $ID3TAG_CFLAGS" + LIBS="$LIBS $MPD_LIBS $ID3TAG_LIBS" + CPPFLAGS=$CFLAGS + AC_CHECK_HEADERS(id3tag.h,use_libid3tag=yes, + [use_libid3tag=no]) + if test x$use_libid3tag = xyes; then + AC_CHECK_LIB(id3tag,id3_file_open, + [MPD_LIBS="$MPD_LIBS $ID3TAG_LIBS"; + MPD_CFLAGS="$MPD_CFLAGS $ID3TAG_CFLAGS"; + use_libid3tag=yes], + [use_libid3tag=no]) + fi + CFLAGS=$oldcflags + LIBS=$oldlibs + CPPFLAGS=$oldcppflags + if test x$use_libid3tag = xyes; then + AC_DEFINE(HAVE_ID3TAG,1,[Define to use id3tag]) + else + enable_id3=no + fi +fi + +MAD_SUBDIR="" + +if test x$enable_mp3 = xyes; then + if test "x$mad_libraries" != "x" ; then + MAD_LIBS="-L$mad_libraries" + elif test "x$mad_prefix" != "x" ; then + MAD_LIBS="-L$mad_prefix/lib" + fi + + MAD_LIBS="$MAD_LIBS -lmad" + + if test "x$mad_includes" != "x" ; then + MAD_CFLAGS="-I$mad_includes" + elif test "x$mad_prefix" != "x" ; then + MAD_CFLAGS="-I$mad_prefix/include" + fi + + oldcflags=$CFLAGS + oldlibs=$LIBS + oldcppflags=$CPPFLAGS + CFLAGS="$CFLAGS $MPD_CFLAGS $MAD_CFLAGS" + LIBS="$LIBS $MPD_LIBS $MAD_LIBS" + CPPFLAGS=$CFLAGS + AC_CHECK_HEADERS(mad.h,use_libmad=yes, + [use_libmad=no]) + if test x$use_libmad = xyes; then + AC_CHECK_LIB(mad,mad_stream_init,[MPD_LIBS="$MPD_LIBS $MAD_LIBS"; + MPD_CFLAGS="$MPD_CFLAGS $MAD_CFLAGS"; + use_libmad=yes],[use_libmad=no]) + fi + CFLAGS=$oldcflags + LIBS=$oldlibs + CPPFLAGS=$oldcppflags + if test x$use_libmad = xyes; then + AC_DEFINE(HAVE_MAD,1,[Define to use libmad]) + else + enable_mp3=no + fi +fi + +if test x$enable_mpc = xyes; then + if test "x$mpcdec_libraries" != "x" ; then + MPCDEC_LIBS="-L$mpcdec_libraries" + elif test "x$mpcdec_prefix" != "x" ; then + MPCDEC_LIBS="-L$mpcdec_prefix/lib" + fi + + MPCDEC_LIBS="$MPCDEC_LIBS -lmpcdec" + + if test "x$mpcdec_includes" != "x" ; then + MPCDEC_CFLAGS="-I$mpcdec_includes" + elif test "x$mpcdec_prefix" != "x" ; then + MPCDEC_CFLAGS="-I$mpcdec_prefix/include" + fi + + oldcflags=$CFLAGS + oldlibs=$LIBS + oldcppflags=$CPPFLAGS + CFLAGS="$CFLAGS $MPD_CFLAGS $MPCDEC_CFLAGS -I." + LIBS="$LIBS $MPD_LIBS $MPCDEC_LIBS" + CPPFLAGS=$CFLAGS + AC_CHECK_HEADER(mpcdec/mpcdec.h,,enable_mpc=no) + if test x$enable_mpc = xyes; then + AC_CHECK_LIB(mpcdec,main,[MPD_LIBS="$MPD_LIBS $MPCDEC_LIBS";MPD_CFLAGS="$MPD_CFLAGS $MPCDEC_CFLAGS";],enable_mpc=no) + fi + if test x$enable_mpc = xyes; then + AC_DEFINE(HAVE_MPCDEC,1,[Define to use libmpcdec for MPC decoding]) + else + AC_MSG_WARN([mpcdec lib needed for MPC support -- disabling MPC support]) + fi + CFLAGS=$oldcflags + LIBS=$oldlibs + CPPFLAGS=$oldcppflags +fi + +if test x$enable_wavpack = xyes; then + PKG_CHECK_MODULES([WAVPACK], [wavpack], + [enable_wavpack=yes;AC_DEFINE([HAVE_WAVPACK], 1, [Define to enable WavPack support])] MPD_LIBS="$MPD_LIBS $WAVPACK_LIBS" MPD_CFLAGS="$MPD_CFLAGS $WAVPACK_CFLAGS", + [enable_wavpack=no;AC_MSG_WARN([WavPack not found -- disabling])]) +fi + +MP4FF_SUBDIR="" + +if test x$enable_aac = xyes; then + if test "x$faad_libraries" != "x" ; then + FAAD_LIBS="-L$faad_libraries" + elif test "x$faad_prefix" != "x" ; then + FAAD_LIBS="-L$faad_prefix/lib" + fi + + FAAD_LIBS="$FAAD_LIBS -lfaad" + + if test "x$faad_includes" != "x" ; then + FAAD_CFLAGS="-I$faad_includes" + elif test "x$faad_prefix" != "x" ; then + FAAD_CFLAGS="-I$faad_prefix/include" + fi + + oldcflags=$CFLAGS + oldlibs=$LIBS + oldcppflags=$CPPFLAGS + CFLAGS="$CFLAGS $MPD_CFLAGS $FAAD_CFLAGS -I." + LIBS="$LIBS $MPD_LIBS $FAAD_LIBS" + CPPFLAGS=$CFLAGS + AC_CHECK_HEADER(faad.h,,enable_aac=no) + if test x$enable_aac = xyes; then + AC_CHECK_DECL(FAAD2_VERSION,,enable_aac=no,[#include ]) + fi + if test x$enable_aac = xyes; then + AC_CHECK_DECL(faacDecInit2,,enable_aac=no,[#include ]) + fi + if test x$enable_aac = xyes; then + AC_CHECK_LIB(faad,faacDecInit2,[MPD_LIBS="$MPD_LIBS $FAAD_LIBS";MPD_CFLAGS="$MPD_CFLAGS $FAAD_CFLAGS";MP4FF_SUBDIR="mp4ff";MP4FF_LIB="mp4ff/libmp4ff.la"],enable_aac=no) + if test x$enable_aac = xno; then + enable_aac=yes + AC_CHECK_LIB(faad,NeAACDecInit2,[MPD_LIBS="$MPD_LIBS $FAAD_LIBS";MPD_CFLAGS="$MPD_CFLAGS $FAAD_CFLAGS";MP4FF_SUBDIR="mp4ff";MP4FF_LIB="mp4ff/libmp4ff.la"],enable_aac=no) + fi + fi + if test x$enable_aac = xyes; then + AC_MSG_CHECKING(that FAAD2 uses buffer and bufferlen) + AC_COMPILE_IFELSE([ +#include + +int main() { + char buffer; + long bufferlen = 0; + faacDecHandle decoder; + faacDecFrameInfo frameInfo; + faacDecConfigurationPtr config; + unsigned char channels; + long sampleRate; + mp4AudioSpecificConfig mp4ASC; + + decoder = faacDecOpen(); + config = faacDecGetCurrentConfiguration(decoder); + config->outputFormat = FAAD_FMT_16BIT; + faacDecSetConfiguration(decoder,config); + AudioSpecificConfig(&buffer, bufferlen, &mp4ASC); + faacDecInit(decoder,&buffer,bufferlen,&sampleRate,&channels); + faacDecInit2(decoder,&buffer,bufferlen,&sampleRate,&channels); + faacDecDecode(decoder,&frameInfo,&buffer,bufferlen); + + return 0; +} +],[AC_MSG_RESULT(yes);AC_DEFINE(HAVE_FAAD_BUFLEN_FUNCS,1,[Define if FAAD2 uses buflen in function calls])],[AC_MSG_RESULT(no); + AC_MSG_CHECKING(that FAAD2 can even be used) + AC_COMPILE_IFELSE([ +#include + +int main() { + char buffer; + faacDecHandle decoder; + faacDecFrameInfo frameInfo; + faacDecConfigurationPtr config; + unsigned char channels; + long sampleRate; + long bufferlen = 0; + unsigned long dummy1_32; + unsigned char dummy2_8, dummy3_8, dummy4_8, dummy5_8, dummy6_8, + dummy7_8, dummy8_8; + + decoder = faacDecOpen(); + config = faacDecGetCurrentConfiguration(decoder); + config->outputFormat = FAAD_FMT_16BIT; + faacDecSetConfiguration(decoder,config); + AudioSpecificConfig(&buffer,&dummy1_32,&dummy2_8, + &dummy3_8,&dummy4_8,&dummy5_8, + &dummy6_8,&dummy7_8,&dummy8_8); + faacDecInit(decoder,&buffer,&sampleRate,&channels); + faacDecInit2(decoder,&buffer,bufferlen,&sampleRate,&channels); + faacDecDecode(decoder,&frameInfo,&buffer); + faacDecClose(decoder); + + return 0; +} +],AC_MSG_RESULT(yes),[AC_MSG_RESULT(no);enable_aac=no]) + ]) + fi + if test x$enable_aac = xyes; then + AC_CHECK_TYPES(mp4AudioSpecificConfig,,,[#include ]) + AC_CHECK_MEMBERS([faacDecConfiguration.downMatrix,faacDecConfiguration.dontUpSampleImplicitSBR,faacDecFrameInfo.samplerate],,,[#include ]) + AC_DEFINE(HAVE_FAAD,1,[Define to use FAAD2 for AAC decoding]) + else + AC_MSG_WARN([faad2 lib needed for MP4/AAC support -- disabling MP4/AAC support]) + fi + CFLAGS=$oldcflags + LIBS=$oldlibs + CPPFLAGS=$oldcppflags +fi + +if test x$use_tremor = xyes; then + if test "x$tremor_libraries" != "x" ; then + TREMOR_LIBS="-L$tremor_libraries" + elif test "x$tremor_prefix" != "x" ; then + TREMOR_LIBS="-L$tremor_prefix/lib" + fi + TREMOR_LIBS="$TREMOR_LIBS -lvorbisidec" + if test "x$tremor_includes" != "x" ; then + TREMOR_CFLAGS="-I$tremor_includes" + elif test "x$tremor_prefix" != "x" ; then + TREMOR_CFLAGS="-I$tremor_prefix/include" + fi + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $TREMOR_CFLAGS" + LIBS="$LIBS $TREMOR_LIBS" + AC_CHECK_LIB(vorbisidec,ov_read,enable_oggvorbis=yes,enable_oggvorbis=no;AC_MSG_WARN([vorbisidec lib needed for ogg support with tremor -- disabling ogg support])) + if test x$enable_oggvorbis = xno; then + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi +elif test x$enable_oggvorbis = xyes; then + XIPH_PATH_OGG(,enable_oggvorbis=no) + XIPH_PATH_VORBIS(,enable_oggvorbis=no) + if test x$enable_oggvorbis = xyes; then + MPD_LIBS="$MPD_LIBS $OGG_LIBS $VORBIS_LIBS $VORBISFILE_LIBS" + MPD_CFLAGS="$MPD_CFLAGS $OGG_CFLAGS $VORBIS_CFLAGS" + + if test x$enable_shout = xyes; then + MPD_LIBS="$MPD_LIBS $VORBISENC_LIBS" + MPD_CFLAGS="$MPD_CFLAGS $VORBISFILE_CFLAGS $VORBISENC_CFLAGS" + fi + fi +fi + +if test x$enable_oggvorbis = xyes; then + AC_DEFINE(HAVE_OGGVORBIS,1,[Define for Ogg Vorbis support]) +fi + +if test x$use_tremor = xyes; then + AC_DEFINE(HAVE_TREMOR,1,[Define to use tremor (libvorbisidec) for ogg support]) + if test x$enable_oggflac = xyes; then + AC_MSG_WARN([disabling OggFLAC support because it is incompatible with tremor]) + enable_oggflac=no + fi +fi + +if test x$enable_flac = xyes; then + oldmpdcflags="$MPD_CFLAGS" + oldmpdlibs="$MPD_LIBS" + AM_PATH_LIBFLAC(MPD_LIBS="$MPD_LIBS $LIBFLAC_LIBS" MPD_CFLAGS="$MPD_CFLAGS $LIBFLAC_CFLAGS",enable_flac=no) +fi + + +if test x$enable_flac = xyes; then + oldcflags="$CFLAGS" + oldlibs="$LIBS" + CFLAGS="$CFLAGS $MPD_CFLAGS" + LIBS="$LIBS $MPD_LIBS" + AC_CHECK_LIB(FLAC, FLAC__metadata_object_vorbiscomment_find_entry_from, + ,[enable_flac=no;AC_MSG_WARN(You need FLAC 1.1 -- disabling flac support)]) + if test x$enable_flac = xno; then + MPD_CFLAGS="$oldmpdcflags" + MPD_LIBS="$oldmpdlibs" + else + AC_CHECK_DECL(FLAC_API_SUPPORTS_OGG_FLAC, + [enable_oggflac=flac], [], + [#include ]) + fi + CFLAGS="$oldcflags" + LIBS="$oldlibs" +fi + + +if test x$enable_flac = xyes; then + AC_DEFINE(HAVE_FLAC,1,[Define for FLAC support]) +fi + + +if test x$enable_oggflac = xyes; then + oldmpdcflags="$MPD_CFLAGS" + oldmpdlibs="$MPD_LIBS" + AM_PATH_LIBOGGFLAC(MPD_LIBS="$MPD_LIBS $LIBOGGFLAC_LIBS" MPD_CFLAGS="$MPD_CFLAGS $LIBOGGFLAC_CFLAGS",enable_oggflac=no) +fi + +if test x$enable_oggflac = xyes; then + AC_DEFINE(HAVE_OGGFLAC,1,[Define for OggFLAC support]) +fi + + +if test x$enable_audiofile = xyes; then + AM_PATH_AUDIOFILE(0.1.7, MPD_LIBS="$MPD_LIBS $AUDIOFILE_LIBS" MPD_CFLAGS="$MPD_CFLAGS $AUDIOFILE_CFLAGS", + [enable_audiofile=no;AC_MSG_WARN(You need audiofile -- disabling audiofile support)]) +fi + +if test x$enable_audiofile = xyes; then + AC_DEFINE(HAVE_AUDIOFILE,1,[Define for audiofile support]) +fi + +if test x$enable_mod = xyes; then + AM_PATH_LIBMIKMOD(3.1.7, MPD_CFLAGS="$MPD_CFLAGS $LIBMIKMOD_CFLAGS" + MPD_LIBS="$MPD_LIBS $LIBMIKMOD_LIBS $LIBMIKMOD_LDADD", enable_mod=no) + if test x$enable_mod = xyes; then + AC_DEFINE(HAVE_MIKMOD, 1, [Define for mikmod support]) + fi +fi + +case $with_zeroconf in +no|avahi|bonjour) + ;; +*) + with_zeroconf=auto + ;; +esac + +if test x$with_zeroconf != xno; then + if test x$with_zeroconf = xavahi || test x$with_zeroconf = xauto; then + PKG_CHECK_MODULES([AVAHI], [avahi-client], + [found_avahi=1;AC_DEFINE([HAVE_AVAHI], 1, [Define to enable Avahi Zeroconf support])] + MPD_LIBS="$MPD_LIBS $AVAHI_LIBS" MPD_CFLAGS="$MPD_CFLAGS $AVAHI_CFLAGS", + [found_avahi=0]) + fi + + if test x$found_avahi = x1; then + with_zeroconf=avahi + elif test x$with_zeroconf = xavahi; then + with_zeroconf=no + fi + + if test x$with_zeroconf = xbonjour || test x$with_zeroconf = xauto; then + AC_CHECK_HEADER(dns_sd.h, + [found_bonjour=1;AC_DEFINE([HAVE_BONJOUR], 1, [Define to enable Bonjour Zeroconf support])], + [found_bonjour=0]) + AC_CHECK_LIB(dns_sd, DNSServiceRegister, + MPD_LIBS="$MPD_LIBS -ldns_sd") + fi + + if test x$found_bonjour = x1; then + with_zeroconf=bonjour + elif test x$with_zeroconf = xbonjour; then + with_zeroconf=no + fi + + if test x$with_zeroconf = xauto || test x$with_zeroconf = xno; then + AC_MSG_WARN([No supported Zeroconf backend found, disabling Zeroconf]) + with_zeroconf=no + else + AC_DEFINE([HAVE_ZEROCONF], 1, [Define to enable Zeroconf support]) + fi +fi + +AC_OUTPUT(src/mp4ff/Makefile doc/Makefile src/Makefile Makefile ) + +echo "" +echo "########### MPD CONFIGURATION ############" +echo "" + +echo " Playback Support:" +if test x$enable_ao = xyes; then + echo " libao support .................enabled" +else + echo " libao support .................disabled" +fi + +if test x$enable_oss = xyes; then + echo " OSS support ...................enabled" +else + echo " OSS support ...................disabled" +fi + +if test x$enable_alsa = xyes; then + echo " ALSA support ..................enabled" +else + echo " ALSA support ..................disabled" +fi + +if test x$enable_jack = xyes; then + echo " JACK support ..................enabled" +else + echo " JACK support ..................disabled" +fi + +if test x$enable_osx = xyes; then + echo " OS X support ..................enabled" +else + echo " OS X support ..................disabled" +fi + +if test x$enable_pulse = xyes; then + echo " PulseAudio support ............enabled" +else + echo " PulseAudio support ............disabled" +fi + +if test x$enable_fifo = xyes; then + echo " FIFO support ..................enabled" +else + echo " FIFO support ..................disabled" +fi + +if test x$enable_mvp = xyes; then + echo " Media MVP support .............enabled" +else + echo " Media MVP support .............disabled" +fi + +if test x$enable_shout = xyes; then + echo " Shout streaming support .......enabled" +else + echo " Shout streaming support .......disabled" +fi + +echo "" + +if test x$enable_ao = xno && + test x$enable_oss = xno && + test x$enable_shout = xno && + test x$enable_alsa = xno && + test x$enable_osx = xno && + test x$enable_pulse = xno && + test x$enable_jack = xno && + test x$enable_fifo = xno && + test x$enable_mvp = xno; then + AC_MSG_ERROR([No Audio Output types configured!]) +fi + +echo " File Format Support:" + +if test x$enable_id3 = xyes; then + echo " ID3 tag support ...............enabled" +else + echo " ID3 tag support ...............disabled" +fi + +if test x$enable_mp3 = xyes; then + echo " mp3 support ...................enabled" +else + echo " mp3 support ...................disabled" +fi + +if test x$enable_oggvorbis = xyes; then + echo " Ogg Vorbis support ............enabled" + if test x$use_tremor = xyes; then + echo " using tremor.................yes" + else + echo " using tremor.................no" + fi +else + echo " Ogg Vorbis support ............disabled" +fi + +if test x$enable_flac = xyes; then + echo " FLAC support ..................enabled" +else + echo " FLAC support ..................disabled" +fi + +case $enable_oggflac in +yes) + echo " OggFLAC support ...............enabled" + ;; +flac) + echo " OggFLAC support ...............enabled(FLAC 1.1.3)" + ;; +*) + echo " OggFLAC support ...............disabled" + ;; +esac + +if test x$enable_audiofile = xyes; then + echo " Wave file support .............enabled" +else + echo " Wave file support .............disabled" +fi + +if test x$enable_aac = xyes; then + echo " MP4/AAC support ...............enabled" +else + echo " MP4/AAC support ...............disabled" +fi + +if test x$enable_mpc = xyes; then + echo " Musepack (MPC) support ........enabled" +else + echo " Musepack (MPC) support ........disabled" +fi + +if test x$enable_wavpack = xyes; then + echo " WavPack support ...............enabled" +else + echo " WavPack support ...............disabled" +fi + +if test x$enable_mod = xyes; then + echo " MOD support ...................enabled" +else + echo " MOD support ...................disabled" +fi + +if + test x$enable_mp3 = xno && + test x$enable_oggvorbis = xno && + test x$enable_flac = xno && + test x$enable_oggflac = xno && + test x$enable_audiofile = xno && + test x$enable_aac = xno && + test x$enable_mpc = xno && + test x$enable_wavpack = xno && + test x$enable_mod = xno; then + AC_MSG_ERROR([No input plugins supported!]) +fi + +echo "" +echo " Other features:" + +if test x$enable_lsr = xyes; then + echo " libsamplerate support .........enabled" +else + echo " libsamplerate support .........disabled" +fi + + +if test x$with_zeroconf != xno; then + echo " Zeroconf support ..............$with_zeroconf" +else + echo " Zeroconf support ..............disabled" +fi + +echo "" +echo "##########################################" +echo "" +echo "You are now ready to compile MPD" +echo "Type \"make\" to compile MPD" diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..90c3392 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,47 @@ +Current Developers +------------------ +Warren Dukes + general + +J. Alexander Treuman + general, MP3, ID3, PulseAudio, format conversion, stored playlists + +Eric Wong + general, FLAC, mpd-ke branch + +José Anarch + JACK plugin + +Guus Sliepen + libsamplerate code + +Jim Ramsay + Zerconf/avahi support + +Qball Cow + Playlist commands + +Patrik Weiskircher + Stored playlist commands + +Laszlo Ashin + WavPack support + +Former Developers +----------------- +tw-nym + +Nagilum + setuid + +Niklas Hofer + 'next' and 'previous' patch + +mackstann + command.c and signal handling cleanup + +AliasMrJones + replayGain + +mp4ff copyrighted by M. Bakker, Ahead Software AG, http://www.nero.com +compress.[ch] copyrighted by fluffy diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..d60c31a --- /dev/null +++ b/COPYING @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..2e629cf --- /dev/null +++ b/ChangeLog @@ -0,0 +1,350 @@ +ver 0.14.0 (????/??/??) +* New null audio output +* Zeroconf support using Bonjour +* New zeroconf_enabled option so that Zeroconf support can be disabled +* Enable the AAC input plugin if support for it has been compiled in +* Support for playing MP4 streams +* Stop the player/decode processes when not playing to allow the CPU to sleep +* Fix a bug where closing an ALSA dmix device could cause MPD to hang +* Make the shout output block while trying to connect instead of failing +* New timeout parameter for shout outputs to define a connection timeout +* New FIFO audio output +* Support for WavPack files + +ver 0.13.0 (2007/5/28) +* New JACK audio output +* Support for "file" as an alternative to "filename" in search, find, and list +* FLAC 1.1.3 API support +* New playlistadd command for adding to stored playlists +* New playlistclear command for clearing stored playlists +* Fix a bug where "find any" and "list any" wouldn't return any results +* Make "list any" return an error instead of no results and an OK +* New gapless_mp3_playback option to disable gapless MP3 playback +* Support for seeking HTTP streams +* Zeroconf support using Avahi +* libsamplerate support for high quality audio resampling +* ID3v2 "Original Artist/Performer" tag support +* New playlistsearch command for searching the playlist (similar to "search") +* New playlistfind command for finding songs in the playlist (similar to "find") +* libmikmod 3.2.0 beta support +* New tagtypes command for retrieving a list of available tag types +* Fix a bug where no ACK was returned if loading a playlist failed +* Fix a bug where db_update in stats would be 0 after initial database creation +* New count command for getting stats on found songs (similar to "find") +* New playlistmove command for moving songs in stored playlists +* New playlistdelete command for deleting songs from stored playlists +* New rename command for renaming stored playlists +* Increased default buffer_before_play from 0% to 10% to prevent skipping +* Lots of bug fixes, cleaned up code, and performance improvements + +ver 0.12.2 (2007/3/20) +* Fix a bug where clients could cause MPD to segfault + +ver 0.12.1 (2006/10/10) +* Fix segfault when scanning an MP3 that has a Xing tag with 0 frames +* Fix segfault when there's no audio output specified and one can't be detected +* Fix handling of escaping in quotes +* Allow a quality of -1 to be specified for shout outputs +* A few minor cleanups + +ver 0.12.0 (2006/9/22) +* New audio output code which supports: + * A plugin-like architecture + * Non-libao ("native") outputs: + * ALSA + * OSS + * OS X + * Media MVP + * PulseAudio + * Shout (Icecast or Shoutcast) + * Playing through multiple outputs at once + * Enabling/disabling outputs while MPD is running + * Saving output state (enabled/disabled) to the state_file +* OggFLAC support +* Musepack support +* Gapless MP3 playback +* MP3 ReplayGain support (using ID3v2 tags only) +* Support for MP2 files if MP3 support is enabled +* Composer, Performer, Comment, and Disc metadata support +* New outputs command for listing available audio outputs +* New enableoutput and disableoutput commands for enabling/disabling outputs +* New plchangesposid command for a stripped down version of plchanges +* New addid command for adding to the playlist and returning a song ID +* New commands and notcommands commands for checking available commands +* Can now specify any supported metadata type or "any" in search, find, and list +* New volume_normalization parameter for enabling Audio Compress normalization +* New metadata_to_use parameter for choosing supported metadata types +* New pid_file parameter for saving the MPD process ID to the specified file +* The db_file parameter is now required +* The port parameter is now optional (defaults to 6600) +* Can specify bind_to_address multiple times +* New --kill argument for killing MPD if pid_file is specified +* Removed --update-db argument (use the update function in your client instead) +* New mpdconf.example +* New mpd.conf man page +* Removed bundled libmad and libid3tag +* Lots of bug fixes, cleaned up code, and performance improvements + +ver 0.11.5 (2004/11/1) +1) New id3v1_encoding config option to configure the id3v1 tag encoding (patch from dottedmag) +2) Strip '\r' from m3u playlists (thank you windows) +3) Use random() instead of rand() for playlist randomizing +4) Fix a bug trying skipping some commented lines in m3u playlist files +5) Fix a bug when fetching metadata from streams that may cause certain weirdnesses +6) Fix a bug where replaygain preamp was used on files w/o replaygain tags +7) Fix a busy loop when trying to prebuffer a nonexistant or missing stream +8) Fix a bug in forgetting to remove leading ' ' in content-type for http streams +9) Check for ice-name in http headers +10) Be sure the strip all '\n' chars in tags +11) Set $HOME env variable when setuid'ing, this should fix the /root/.mcop errors triggered by arts/libao + +ver 0.11.4 (2004/7/26) +1) Fixed a segfault when decoding mp3's with corrupt id3v2 tags +2) Fixed a memory leak when encountering id3v2 tags in mp3 decoder + +ver 0.11.3 (2004/7/21) +1) Add support for http authentication for streams +2) Added replaygain pre-amp support +3) Better error handling for fread() in inputStream_file +4) Fixed a bug so that when a freeAllInterfaces is called, it sets max_interface_connections to 0. This prevents potential segfaults and other nastiness for forked processes, like the player and update-er (do to interfacePrintWithFD()). +5) Allow blockingWrite() to handle errors more gracefully (for example, if the disc is full, and thus the write() fails or can't be completed, we just skip this write() and continue, instead of getting stuck in an infinite loop until the write() becomes successful) +6) Updated mpdconf.example from sbh/avuton +7) If "user" is specified, then convert ~ in paths to the user's home path specified by "user" config paramter (not the actual current user running mpd). + +ver 0.11.2 (2004/7/5) +1) Work around in computing total time for mp3's whose first valid mpeg frame is not layer III +2) Fix mp3 and mp4 decoders when seeking past the end of the file +3) Fix replaygain for flac and vorbis +4) Fix memory leaks in flac decoder (from normalperson) +5) Fix Several other bugs in playlist.c and directory.c (from normalperson) + +ver 0.11.1 (2004/6/24) +1) Fix a bug that caused "popping" at the beginning of mp3's +2) Fix playlistid command +3) Fix move commands so they don't mess up the song id's +4) Added support for HTTP Proxy +5) Detect and skip recursive links in the music directory +6) Fix addPathToDB() so updating on a specific path doesn't exist correctly adds the parent directories to the DB + +ver 0.11.0 (2004/6/18) +1) Support for playing mp3 and Ogg Vorbis streams +2) Non-blocking Update +3) Replaygain support for Ogg Vorbis and FLAC (by Eric Moore aka AliasMrJones) +4) audio_output_format option that allows for all audio output to be converted to a format compatible with any sound card +5) Own routines for to always support UTF-8 <-> ISO-8859-1 conversion +6) Added "Id" and "Pos" metadata for songs in playlist +7) Added commands: plchanges, currentsong, playid, seekid, playlistid, moveid, swapid, deleteid +8) UTF-8 validation of all tags +9) Update specific files/directories (for fast, incremental updating) +10) Added ACK error codes +11) Mod file support +12) Added command_list_ok_begin +13) Play after stop resumes from last position in the playlist +14) Play while pause resumes playback +15) Better signal handling by mackstann +16) Cleanup decoder interface (now called InputPlugins) +17) --create-db no long starts the daemon +18) --no-daemon outputs to log files +19) --stdout sends output to stdout/stderr +20) Default port is now 6600 +21) Lots of other cleanups and Bugfixes + +ver 0.10.4 (2004/5/26) +1) Fix configure problems on OpenBSD with langinfo and iconv +2) Fix an infinte loop when writing to an interface and it has expired +3) Fix a segfault in decoding flac's +4) Ingore CRC stuff in mp3's since some encoders did not compute the CRC correctly +5) Fix a segfault in processing faulty mp4 metadata + +ver 0.10.3 (2004/4/2) +1) Fix a segfault when a blanck line is sent from a client +2) Fix for loading playlists on platforms where char is unsigned +3) When pausing, release audio device after we say pause is successful (this makes pause appear to not lag) +4) When returning errors for unknown types by player, be sure to copy the filename +5) add --disable-alsa for disabling alsa mixer support +6) Use select() for a portable usleep() +7) For alsa mixer, default to "Master' element, not first element + +ver 0.10.2 (2004/3/25) +1) Add suport for AAC +2) Substitute '\n' with ' ' in tag info +3) Remove empty directories from db +4) Resume from current position in song when using state file +5) Pause now closes the music device, and reopens it on resuming +6) Fix unnecessary big endian byte swapping +7) If locale is "C" or "POSIX", then use ISO-8859-1 as the fs charset +8) Fix a bug where alsa mixer wasn't detecting volume changes +9) For alsa and software mixer, show volume to be the same as it was set (even if its not the exact volume) +10) Report bitrate for wave files +11) Compute song length of CBR mp3's more accurately + +ver 0.10.1 (2004/3/7) +1) Check to see if we need to add "-lm" when linking mpd +2) Fix issues with skipping bad frames in an mp3 (this way we get the correct samplerate and such) +3) Fix crossfading bug with ogg's +4) Updated libmad and libid3tag included w/ source to 0.15.1b + +ver 0.10.0 (2004/3/3) +1) Use UTF-8 for all client communications +2) Crossfading support +3) Password Authentication (all in plaintext) +4) Software mixer +5) Buffer Size is configurable +6) Reduced Memory consumption (use directory tree for search and find) +7) Bitrate support for Flac +8) setvol command (deprecates volume command) +9) add command takes directories +10) Path's in config file now work with ~ +11) Add samplerate,bits, and channels to status +12) Reenable playTime in stats display +13) Fix a segfault when doing: add "" +14) Fix a segfault with flac vorbis comments simply being "=" +15) Fix a segfault/bug in queueNextSong with repeat+random +16) Fix a bug, where one process may segfault, and cause more processes to spawn w/o killing ones that lost their parent. +17) Fix a bug when the OSS device was unable to fetch the current volume, +it would close the device (when it maybe previously closed by the exact same code) +18) command.c cleanup by mackstann +19) directory.c and command.c cleanup by tw-nym + +ver 0.9.4 (2004/1/21) +1) Fix a bug where updated tag info wasn't being detected +2) Set the default audio write size to 1024 bytes (should decrease cpu load a bit on some machines). +3) Make audio write size configurable via "audio_write_size" config option +4) Tweak output buffer size for connections by detecting the kernel output buffer size. + +ver 0.9.3 (2003/10/31) +1) Store total time/length of songs in db and display in *info commands +2) Display instantaneous bitrate in status command +3) Add Wave Support using libaudiofile (Patch from normalperson) +4) Command code cleanup (Patch from tw-nym) +5) Optimize listing of playlists (10-100x faster) +6) Optimize interface output (write in 4kB chunks instead of on every '\n') +7) Fix bug that prevented rm command from working +8) Fix bug where deleting current song skips the next song +9) Use iconv to convert vorbis comments from UTF-8 to Latin1 + +ver 0.9.2 (2003/10/6) +1) Fix FreeBSD Compilation Problems +2) Fix bug in move command +3) Add mixer_control options to configure which mixer control/device mpd controls +4) Randomize on play -1 +5) Fix a bug in toggling repeat off and at the end of the playlist + +ver 0.9.1 (2003/9/30) +1) Fix a statement in the middle of declarations in listen.c, causes error for +gcc 2.7 + +ver 0.9.0 (2003/9/30) +1) Random play mode +2) Alsa Mixer Support +3) Save and Restore "state" +4) Default config file locations (.mpdconf and /etc/mpd.conf) +5) Make db file locations configurable +6) Move songs around in the playlist +7) Gapless playback +8) Use Xing tags for mp3's +9) Remove stop_on_error +10) Seeking support +11) Playlists can be loaded and deleted from subdirectories +12) Complete rewrite of player layer (fork()'s only once, opens and closes +audio device as needed). +13) Eliminate use and dependence of SIGIO +14) IPv6 support +15) Solaris compilations fixes +16) Support for different log levels +17) Timestamps for log entries +18) "user" config parameter for setuid (patch from Nagilum) +19) Other misc features and bug fixes + +ver 0.8.7 (2003/9/3) +1) Fix a memory leak. When closing a interface, was called close() on the fd +instead of calling fclose() on the fp that was opened with fdopen(). + +ver 0.8.6 (2003/8/25) +1) Fix a memory leak when a buffered existed, and a connection was unexpectedly closed, and i wasn't free'ing the buffer apropriatly. + +ver 0.8.5 (2003/8/17) +1) Fix a bug where an extra end of line is returned when attempting to play a +non existing file. This causes parsing errors for clients. + +ver 0.8.4 (2003/8/13) +1) Fix a bug where garbage is returned with errors in "list" command + +ver 0.8.3 (2003/8/12) +1) Fix a compilation error on older linux systems +2) Fix a bug in searching by title +3) Add "list" command +4) Add config options for specifying libao driver/plugin and options +5) Add config option to specify which address to bind to +6) Add support for loading and saving absolute pathnames in saved playlists +7) Playlist no longer creates duplicate entries for song data (more me +efficient) +8) Songs deleted from the db are now removed for the playlist as well + +ver 0.8.2 (2003/7/22) +1) Increased the connection que for listen() from 0 to 5 +2) Cleanup configure makefiles so that mpd uses MPD_LIBS and MPD_CFLAGS +rather than LIBS and CFLAGS +3) Put a cap on the number of commands per command list +4) Put a cap on the maximum number of buffered output lines +5) Get rid of TIME_WAIT/EADDRINUSE socket problem +6) Use asynchronious IO (i.e. trigger SIGIO instead so we can sleep in +select() calls longer) + +ver 0.8.1 (2003/7/11) +1) FreeBSD fixes +2) Fix for rare segfault when updating +3) Fix bug where client was being hungup on when done playing current song +4) Fix bug when playing flac's where it incorrectly reports an error +5) Make stop playlist on error configurable +6) Configure checks for installed libmad and libid3tag and uses those if found +7) Use buffer->finished in *_decode's instead of depending on catching signals + +ver 0.8.0 (2003/7/6) +1) Flac support +2) Make playlist max length configurable +3) New backward compatible status (backward compatible for 0.8.0 on) +4) listall command now can take a directory as an argument +5) Buffer rewritten to use shared memory instead of sockets +6) Playlist adding done using db +7) Add sort to list, and use binary search for finding +8) New "stats" command +9) Command list (for faster adding of large batches of files) +10) Add buffered chunks before play +11) Useful error reporting to clients (part of status command) +12) Use libid3tag for reading id3 tags (more stable) +13) Non-blocking output to clients +14) Fix bug when removing items from directory +15) Fix bug when playing mono mp3's +16) Fix bug when attempting to delete files when using samba +17) Lots of other bug fixes I can't remember + +ver 0.7.0 (2003/6/20) +1) use mad instead of mpg123 for mp3 decoding +2) volume support +3) repeate playlist support +4) use autoconf/automake (i.e. "configure") +5) configurable max connections + +ver 0.6.2 (2003/6/11) +1) Buffer support for ogg +2) new config file options: "connection_timeout" and "mpg123_ignore_junk" +3) new commands: "next", "previous", and "listall" +Thanks to Niklas Hofer for "next" and "previous" patches! +4) Search by filename +5) bug fix for pause when playing mp3's + +ver 0.6.1 (2003/5/29) +1) Add conf file support +2) Fix a bug when doing mp3stop (do wait3(NULL,WNOHANG|WUNTRACED,NULL)) +3) Fix a bug when fork'ing, fflush file buffers before forking so the +child doesn't print the same stuff in the buffer. + +ver 0.6.0 (2003/5/25) +1) Add ogg vorbis support +2) Fix two bugs relating to tables, one for search by title, and one where we +freed the tables before directories, causing a segfault +3) The info command has been removed. + +ver 0.5.0-0.5.2 +Initial release(s). Support for MP3 via mpg123 diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..e0bc9e5 --- /dev/null +++ b/INSTALL @@ -0,0 +1,131 @@ + Music Player Daemon (MPD) - INSTALL + +Optional Output Dependencies +---------------------------- + +You will need at least one of these to compile MPD. + +Most of these are available as packages on major distributions. Be sure to +install both the library package as well as the development package. + +AO - http://www.xiph.org/ao/ +A portable library that abstracts many audio output types as one API. Should +be used only if there is no native plugin available or if the native plugin +doesn't work. You will need libao. + +ALSA - http://www.alsa-project.org/ +The Advanced Linux Sound Architecture. Recommended audio output if you use +Linux. You will need libasound. + +PulseAudio - http://www.pulseaudio.org/ +An advanced sound daemon. You will need libpulse. + +JACK - http://www.jackaudio.org/ +A low-latency sound daemon. + +libshout - http://www.icecast.org/ +For streaming to an Icecast or Shoutcast server. + +Optional Input Dependencies +--------------------------- + +You will need at least one of these to compile MPD. + +Most of these are available as packages on major distributions. Be sure to +install both the library package as well as the development package. + +MAD - http://www.underbit.com/products/mad/ +For MP3 support. You will need libmad, and optionally libid3tag if you want +ID3 tag support. + +Ogg Vorbis - http://www.xiph.org/ogg/vorbis/ +For Ogg Vorbis support. You will need libogg and libvorbis. + +FLAC - http://flac.sourceforge.net/ +For FLAC support. You will need version 1.1.0 or higher of libflac. + +OggFLAC - http://www.xiph.org/ogg/vorbis/ and http://flac.sourceforge.net/ +For OggFLAC support. You will need liboggflac, which can be built from the +FLAC sources if libogg is already installed. Versions of flac 1.1.3 and +greater will automatically detect and use OggFLAC if it's available. + +Audio File - http://www.68k.org/~michael/audiofile/ +For WAVE, AIFF, and AU support. You will need libaudiofile. + +FAAD2 - http://www.audiocoding.com/ +For MP4/AAC support. You will need libmp4ff. + +libmpcdec - http://www.musepack.net/ +For Musepack support. + +MikMod - http://mikmod.raphnet.net/ +For MOD support. You will need libmikmod. + +Optional Miscellaneous Dependencies +----------------------------------- + +Avahi - http://www.avahi.org/ +For Zeroconf support. + +libsamplerate - http://www.mega-nerd.com/SRC/ +For advanced samplerate conversions. + +Download +-------- + +Get the latest release from of MPD from . + +Compile +------- + +1) unzip and untar the archive + +$ tar zxvf mpd-x.x.x.tar.gz + +or + +$ tar jxvf mpd-x.x.x.tar.bz2 + +2) change to directory created + +$ cd mpd-x.x.x + +3) Run configure script (this will determine what dependencies you have) + +$ ./configure + +4) Compile + +$ make + +Install (Optional) +------- + +(as root) +$ make install + +Run +--- + +1) run mpd: + +$ mpd + +(if no config file is specified, mpd's looks for ~/.mpdconf then /etc/mpd.conf) + +an example would be: + +$ mpd playlists/.mpdconf + +A sample config file is included with the source of MPD, mpdconf.example . + +Note: The first time you run mpd, it will "explore" your mp3 directory for +mp3's. + +Using MPD +--------- + +You can download many different interfaces for MPD at + + +MPD can be interfaced directly using telnet (see COMMANDS, if you are brave). diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..952d427 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,9 @@ +AUTOMAKE_OPTIONS = foreign 1.6 + +SUBDIRS = src doc +docdir = $(prefix)/share/doc/$(PACKAGE) +doc_DATA = README UPGRADING +EXTRA_DIST = COPYING $(doc_DATA) + +sparse-check: + $(MAKE) -C src $@ diff --git a/PATCHES b/PATCHES new file mode 100644 index 0000000..3324df2 --- /dev/null +++ b/PATCHES @@ -0,0 +1,3 @@ +Following patches are applied: +* 1478 +* 1520 diff --git a/README b/README new file mode 100644 index 0000000..b403dd3 --- /dev/null +++ b/README @@ -0,0 +1,22 @@ + + Music Player Daemon (MPD) + http://www.musicpd.org + +A daemon for playing music of various formats. Music is played through the +server's audio device. The daemon stores info about all available music, +and this info can be easily searched and retrieved. Player control, info +retrieval, and playlist management can all be managed remotely. + +To install MPD, see INSTALL. + +MPD includes mp4ff in the source, due to licensing issues of the newer +version and includes bugfixes with the properly licensed version. mp4ff is +released under the GPL and copyrighted by M. Bakker, Ahead Software AG +(http://www.nero.com) and is distributed as a part of the FAAD2 - Freeware +Advance Audio (AAC) Decoder. + +MPD is released under the GNU Public License. +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +For the full license, see COPYING. diff --git a/TODO b/TODO new file mode 100644 index 0000000..f652d4f --- /dev/null +++ b/TODO @@ -0,0 +1,83 @@ +0.14 +---- + +*) data structures + *) remove changes made to linked list for TagTracker + +*) input plugins + *) add support for playing aac streams + +*) mixer + *) add sun support + *) add OS X support + +*) Add support for 24-bit audio + +*) cleanup linked list code! + +*) implement listener socket protocol as documented here: + http://mpd.wikia.com/wiki/MusicPlayerDaemonListenerProtocol + +*) support for dynamically loading plugins + *) cleanup input plugins "API" + *) cleanup output plugins "API" + +*) add error codes for status->error + +*) Cleanup Config File Code + +*) audio output + *) write a esd native audioOutput + *) write a nas native audioOutput + *) allowing "pausing" of audio output devices + *) while pausing, play silence for the devices that don't support + "pausing" + *) write a sun native audioOutput + *) more accurate time reporting by determining how much of audio_device + buffer has been played + +*) state + *) abstract out state code from playlist.c + *) put MPD Version in statefile + +*) add playlistreplace command (replace current playlist with saved playlist + and keep playing) + +*) add command for inserting songs in a specific position + +1.0 +--- + +*) bug fixes + +post-1.0 +-------- + +*) rewrite audio pipe + *) use pthreads/clone + *) try to constrain the use of pthread mutex's and condition's + to specific output plugins + *) use pull model for audio_output + *) threads + 0) managing thread + *) receives commands + *) manages state + *) handles time/metadata sending + 1) decoding thread + 2) effects thread + *) crossfading + *) *command* resampling/conversions + 3) audio_output thread + *) thread for each audio_output device + +*) dynamic metadata + *) implement by recording the ftell positions of entries + *) buffer changes and flush them once every 60 seconds + *) buffer changes while doing an update + *) be sure to check that the metadata "header" is what we expect + before writing at the position + *) add support for: + *) last time played + *) times played + *) times skipped + *) ranking diff --git a/UPGRADING b/UPGRADING new file mode 100644 index 0000000..b25beab --- /dev/null +++ b/UPGRADING @@ -0,0 +1,84 @@ + Music Player Daemon (MPD) - UPGRADING + +Upgrading to 0.13.0 +------------------- + +JACK, Avahi, and libsamplerate have been added as optional dependencies. +FLAC/OggFLAC now supports the 1.1.3 API, and libmikmod 3.2.0 betas are +supported as well. + +New mpd.conf parameters include zeroconf_name, samplerate_converter, and +gapless_mp3_playback. See the mpd.conf man page or updated mpconf.example for +more information on these parameters. + +Support for the ID3v2 "Original Artist/Performer" tag has been added. Your +MP3s will need to be rescanned for these tags to be included in the database. +This can be done by running mpd --create-db. + +Upgrading to 0.12.0 +------------------- + +The ao_driver and ao_driver_options config parameters have been removed and +replaced with the audio_output config section. You will have to update your +config file to use this instead. See the mpd.conf man page or the new +mpdconf.example for details on specifying audio_output sections. + +The db_file parameter is no longer optional. If you did not specify it in your +old config file then you will have to add it in order to run 0.12.0. + +Support for OggFLAC and Musepack audio files has been added. Additionally, +scanning of MP3 files has been improved. To make use of these updates it is +highly recommended that you run mpd --create-db to recreate your entire +database. + +Upgrading to 0.11.0 +------------------- + +The database format has changed a little bit, but in a backward compatible way. +This means that if you upgrade to 0.11.0 from 0.10.x, you do not need to make +any changes. However, if you downgrade back to 0.10.x, then you will need +to recreate your db. + +The default port for MPD is now 6600, so update your mpd and client +configurations appropriately. + +Upgrading to 0.10.0 +------------------- + +All information is now stored in the db in UTF-8 format, and the character +set used for the filesystem is stored in the db. Thus, it is highly +recommended that you recreate the db. To do so, run mpd with the +"--create-db" command line option. Also, note that the filesystem +character set will be determined from your current locale settings. +If your locale settings are not the same as those used for the filesystem, +then use the config file parameter "filesystem_charset" to specify the +correct character set (this maybe necessary if you create the db with root). + +Upgrading to 0.9.3 +------------------ + +Wave support was added, so to have your wave files added, update the db (mpc +update). + +Also, song lengths are now stored in the db. To get this stuff +added to the db, you will need to recreate the db from scratch. To do this, +run mpd with the "--create-db" commandline option. + +Upgrading to 0.9.0 +------------------ + +The "stop_on_error" config parameter was removed, so be sure to remove this +parameter from your config file. + +Upgrading to 0.8.x +------------------ + +If you have FLACs, then to have them added to your list of available music, +just use "update". + +Upgrading from 0.5.x to 0.6.x +----------------------------- +If you have not compiled MPD with "make ogg", then nothing is needed. + +If you compiled with "make ogg", just use "update" (available via the phpMp +interface) to add your OGGs to MPD's list of available music. diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..34dbf34 --- /dev/null +++ b/autogen.sh @@ -0,0 +1,163 @@ +#!/bin/sh +# Run this to set up the build system: configure, makefiles, etc. +# (at one point this was based on the version in enlightenment's cvs) + +package="mpd" + +olddir="`pwd`" +srcdir="`dirname $0`" +test -z "$srcdir" && srcdir=. +cd "$srcdir" +DIE= +AM_VERSIONGREP="sed -e s/.*[^0-9\.]\([0-9]\.[0-9]\).*/\1/" +AC_VERSIONGREP="sed -e s/.*[^0-9\.]\([0-9]\.[0-9][0-9]\).*/\1/" +VERSIONMKINT="sed -e s/[^0-9]//" +if test -n "$AM_FORCE_VERSION" +then + AM_VERSIONS="$AM_FORCE_VERSION" +else + AM_VERSIONS='1.6 1.7 1.8 1.9' +fi +if test -n "$AC_FORCE_VERSION" +then + AC_VERSIONS="$AC_FORCE_VERSION" +else + AC_VERSIONS='2.58 2.59' +fi + +versioned_bins () +{ + bin="$1" + needed_int=`echo $VERNEEDED | $VERSIONMKINT` + for i in $VERSIONS + do + i_int=`echo $i | $VERSIONMKINT` + if test $i_int -ge $needed_int + then + echo $bin-$i $bin$i $bin-$i_int $bin$i_int + fi + done + echo $bin +} + +for c in autoconf autoheader automake aclocal +do + uc=`echo $c | tr a-z A-Z` + eval "val=`echo '$'$uc`" + if test -n "$val" + then + echo "$uc=$val in environment, will not attempt to auto-detect" + continue + fi + + case "$c" in + autoconf|autoheader) + VERNEEDED=`fgrep AC_PREREQ configure.ac | $AC_VERSIONGREP` + VERSIONS="$AC_VERSIONS" + pkg=autoconf + ;; + automake|aclocal) + VERNEEDED=`fgrep AUTOMAKE_OPTIONS Makefile.am | $AM_VERSIONGREP` + VERSIONS="$AM_VERSIONS" + pkg=automake + ;; + esac + printf "checking for $c ... " + for x in `versioned_bins $c`; do + ($x --version < /dev/null > /dev/null 2>&1) > /dev/null 2>&1 + if test $? -eq 0 + then + echo $x + eval $uc=$x + break + fi + done + eval "val=`echo '$'$uc`" + if test -z "$val" + then + if test $c = $pkg + then + DIE="$DIE $c=$VERNEEDED" + else + DIE="$DIE $c($pkg)=$VERNEEDED" + fi + fi +done + +if test -n "$LIBTOOLIZE" +then + echo "LIBTOOLIZE=$LIBTOOLIZE in environment," \ + "will not attempt to auto-detect" +else + printf "checking for libtoolize ... " + for x in libtoolize glibtoolize + do + ($x --version < /dev/null > /dev/null 2>&1) > /dev/null 2>&1 + if test $? -eq 0 + then + echo $x + LIBTOOLIZE=$x + break + fi + done +fi + +if test -z "$LIBTOOLIZE" +then + DIE="$DIE libtoolize(libtool)" +fi + +if test -n "$DIE" +then + echo "You must have the following installed to compile $package:" + for i in $DIE + do + printf ' ' + echo $i | sed -e 's/(/ (from /' -e 's/=\(.*\)/ (>= \1)/' + done + echo "Download the appropriate package(s) for your system," + echo "or get the source from one of the GNU ftp sites" + echo "listed in http://www.gnu.org/order/ftp.html" + exit 1 +fi + +echo "Generating configuration files for $package, please wait...." + +ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $PWD/m4" + +# /usr/share/aclocal is most likely included by default, already... +ac_local_paths=' +/usr/local/share/aclocal +/sw/share/aclocal +/usr/pkg/share/aclocal +/opt/share/aclocal +/usr/gnu/share/aclocal +' + +for i in $ac_local_paths; do + if test -d "$i"; then + ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $i" + # we probably only want one of these... + break + fi +done + +echo " $ACLOCAL $ACLOCAL_FLAGS" +$ACLOCAL $ACLOCAL_FLAGS || exit 1 + +echo " $AUTOHEADER" +$AUTOHEADER || exit 1 + +echo " $LIBTOOLIZE --automake" +$LIBTOOLIZE --automake || exit 1 + +echo " $AUTOMAKE --add-missing $AUTOMAKE_FLAGS" +$AUTOMAKE --add-missing $AUTOMAKE_FLAGS || exit 1 + +echo " $AUTOCONF" +$AUTOCONF || exit 1 + +cd "$olddir" +if test x$NOCONFIGURE = x; then + "$srcdir"/configure "$@" || exit 1 +fi diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..6753dc9 --- /dev/null +++ b/configure.ac @@ -0,0 +1,816 @@ +dnl AC_INIT(src/main.c) +dnl AM_INIT_AUTOMAKE(mpd, 0.14.0) + +AC_PREREQ(2.60) +AC_INIT(mpd, 0.14.0, warren.dukes@gmail.com) +AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION) + +AC_SUBST(MPD_LIBS) +AC_SUBST(MPD_CFLAGS) +AC_SUBST(MP4FF_LIB) +AC_SUBST(MP4FF_SUBDIR) + +AC_PROG_CC +AM_PROG_CC_C_O +AC_PROG_INSTALL +AC_PROG_LIBTOOL +AC_PROG_MAKE_SET + +AM_CONFIG_HEADER(config.h) +AC_DEFINE(PROTOCOL_VERSION, "0.14.0", [The mpd protocol version]) + +MPD_LIBS="" +MPD_CFLAGS="" +if test x$GCC = xyes; then + MPD_CFLAGS="-Wall -Wmissing-prototypes" +fi + +if test -z "$prefix" || test "x$prefix" = xNONE; then + local_lib= + local_include= + + # aren't autotools supposed to be smart enough to figure this out? oh + # well, the git-core Makefile managed to do some of the work for us :) + case "$host_os" in + darwin*) + local_lib='/sw/lib /opt/local/lib' + local_include='/sw/include /opt/local/include' + ;; + freebsd* | openbsd*) + local_lib=/usr/local/lib + local_include=/usr/local/include + ;; + netbsd*) + local_lib=/usr/pkg/lib + local_include=/usr/pkg/include + LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/pkg/lib" + ;; + esac + + for d in $local_lib; do + if test -d "$d"; then + LDFLAGS="$LDFLAGS -L$d" + break + fi + done + for d in $local_include; do + if test -d "$d"; then + CFLAGS="$CFLAGS -I$d" + break + fi + done +fi + +AC_ARG_ENABLE(ao,[ --enable-ao enable support for libao (default: disable)],[enable_ao=$enableval],[enable_ao=no]) +AC_ARG_ENABLE(shout,[ --disable-shout disable support for streaming through shout (default: enable)],[enable_shout=$enableval],[enable_shout=yes]) +AC_ARG_ENABLE(iconv,[ --disable-iconv disable iconv support (default: enable)],[enable_iconv=$enableval],[enable_iconv=yes]) +AC_ARG_ENABLE(ipv6,[ --disable-ipv6 disable IPv6 support (default: enable)],[enable_ipv6=$enableval],[enable_ipv6=yes]) +AC_ARG_ENABLE(oss,[ --disable-oss disable OSS support (default: enable)],[enable_oss=$enableval],[enable_oss=yes]) +AC_ARG_ENABLE(alsa,[ --disable-alsa disable ALSA support (default: enable)],[enable_alsa=$enableval],[enable_alsa=yes]) +AC_ARG_ENABLE(jack,[ --disable-jack disable jack support (default: enable)],[enable_jack=$enableval],[enable_jack=yes]) +AC_ARG_ENABLE(pulse,[ --disable-pulse disable support for the PulseAudio sound server (default: enable)],[enable_pulse=$enableval],[enable_pulse=yes]) +AC_ARG_ENABLE(fifo,[ --disable-fifo disable support for writing audio to a FIFO (default: enable)],[enable_fifo=$enableval],[enable_fifo=yes]) +AC_ARG_ENABLE(mvp,[ --enable-mvp enable support for Hauppauge Media MVP (default: disable)],[enable_mvp=$enableval],[enable_mvp=no]) +AC_ARG_ENABLE(oggvorbis,[ --disable-oggvorbis disable Ogg Vorbis support (default: enable)],[enable_oggvorbis=$enableval],enable_oggvorbis=yes) +AC_ARG_ENABLE(oggflac,[ --disable-oggflac disable OggFLAC support (default: enable)],[enable_oggflac=$enableval],enable_oggflac=yes) +AC_ARG_ENABLE(flac,[ --disable-flac disable flac support (default: enable)],[enable_flac=$enableval],[enable_flac=yes]) +AC_ARG_ENABLE(mp3,[ --disable-mp3 disable mp3 support (default: enable)],[enable_mp3=$enableval],[enable_mp3=yes]) +AC_ARG_ENABLE(aac,[ --disable-aac disable AAC support (default: enable)],[enable_aac=$enableval],[enable_aac=yes]) +AC_ARG_ENABLE(audiofile,[ --disable-audiofile disable audiofile support, disables wave support (default: enable)],[enable_audiofile=$enableval],[enable_audiofile=yes]) +AC_ARG_ENABLE(mod,[ --enable-mod enable MOD support (default: disable)],[enable_mod=$enableval],[enable_mod=yes]) +AC_ARG_ENABLE(mpc,[ --disable-mpc disable musepack (MPC) support (default: enable)],[enable_mpc=$enableval],[enable_mpc=yes]) +AC_ARG_ENABLE(wavpack,[ --disable-wavpack disable WavPack support (default: enable)],[enable_wavpack=$enableval],[enable_wavpack=yes]) +AC_ARG_ENABLE(id3,[ --disable-id3 disable id3 support (default: enable)],[enable_id3=$enableval],[enable_id3=yes]) +AC_ARG_ENABLE(lsr,[ --disable-lsr disable libsamplerate support (default: enable)],[enable_lsr=$enableval],[enable_lsr=yes]) + +AC_ARG_WITH(tremor,[[ --with-tremor[=PFX] Use Tremor(vorbisidec) integer Ogg-Vorbis decoder (with optional prefix)]], use_tremor=yes; test x$withval != xyes && tremor_prefix="$withval",) +AC_ARG_WITH(tremor-libraries,[ --with-tremor-libraries=DIR Directory where Tremor library is installed (optional)], tremor_libraries="$withval", tremor_libraries="") +AC_ARG_WITH(tremor-includes,[ --with-tremor-includes=DIR Directory where Tremor header files are installed (optional)], tremor_includes="$withval", tremor_includes="") + +AC_ARG_WITH(iconv,[ --with-iconv=PFX Prefix where iconv is installed (optional)], iconv_prefix="$withval", iconv_prefix="") +AC_ARG_WITH(iconv-libraries,[ --with-iconv-libraries=DIR Directory where libiconv library is installed (optional)], iconv_libraries="$withval", iconv_libraries="") +AC_ARG_WITH(iconv-includes,[ --with-iconv-includes=DIR Directory where libiconv header files are installed (optional)], iconv_includes="$withval", iconv_includes="") + +AC_ARG_WITH(id3tag,[ --with-id3tag=PFX Prefix where libid3tag is installed (optional)], id3tag_prefix="$withval", id3tag_prefix="") +AC_ARG_WITH(id3tag-libraries,[ --with-id3tag-libraries=DIR Directory where libid3tag library is installed (optional)], id3tag_libraries="$withval", id3tag_libraries="") +AC_ARG_WITH(id3tag-includes,[ --with-id3tag-includes=DIR Directory where libid3tag header files are installed (optional)], id3tag_includes="$withval", id3tag_includes="") + +AC_ARG_WITH(mad,[ --with-mad=PFX Prefix where libmad is installed (optional)], mad_prefix="$withval", mad_prefix="") +AC_ARG_WITH(mad-libraries,[ --with-mad-libraries=DIR Directory where libmad library is installed (optional)], mad_libraries="$withval", mad_libraries="") +AC_ARG_WITH(mad-includes,[ --with-mad-includes=DIR Directory where mad header files are installed (optional)], mad_includes="$withval", mad_includes="") + +AC_ARG_WITH(faad,[ --with-faad=PFX Prefix where faad2 is installed], faad_prefix="$withval", faad_prefix="") +AC_ARG_WITH(faad-libraries,[ --with-faad-libraries=DIR Directory where faad2 library is installed (optional)], faad_libraries="$withval", faad_libraries="") +AC_ARG_WITH(faad-includes,[ --with-faad-includes=DIR Directory where faad2 header files are installed (optional)], faad_includes="$withval", faad_includes="") +AC_ARG_WITH(zeroconf,[[ --with-zeroconf=[auto|avahi|bonjour|no] Enable zeroconf backend (default=auto)]], with_zeroconf="$withval", with_zeroconf="auto") + +AC_ARG_WITH(lsr,[ --with-src=PFX Prefix where libsamplerate is installed], src_prefix="$withval", src_prefix="") +AC_ARG_WITH(lsr-libraries,[ --with-lsr-libraries=DIR Directory where libsamplerate library is installed (optional)], lsr_libraries="$withval", lsr_libraries="") +AC_ARG_WITH(lsr-includes,[ --with-lsr-includes=DIR Directory where libsamplerate header files are installed (optional)], lsr_includes="$withval", lsr_includes="") + +AC_C_BIGENDIAN + +AC_CHECK_SIZEOF(short) +AC_CHECK_SIZEOF(int) +AC_CHECK_SIZEOF(long) +AC_CHECK_SIZEOF(long long) + +AC_CHECK_HEADER(sys/inttypes.h,AC_DEFINE(HAVE_SYS_INTTYPES_H,1,[Define if sys/inttypes.h present]),) + +AC_TYPE_INT64_T +AC_TYPE_UINT64_T + +AC_CHECK_LIB(socket,socket,MPD_LIBS="$MPD_LIBS -lsocket",) +AC_CHECK_LIB(nsl,gethostbyname,MPD_LIBS="$MPD_LIBS -lnsl",) + +AC_CHECK_LIB(m,exp,MPD_LIBS="$MPD_LIBS -lm",) +AC_CHECK_FUNCS(setenv) + + +dnl doesn't work for systems that don't have CODESET like OpenBSD +dnl AC_CHECK_HEADER(langinfo.h,[enable_langinfo=yes;AC_DEFINE(HAVE_LANGINFO,1,[Define if nl_langinfo.h is present])],enable_langinfo=no) +AM_LANGINFO_CODESET +AC_CHECK_HEADER(locale.h,[enable_locale=yes;AC_DEFINE(HAVE_LOCALE,1,[Define if locale.h is present])],enable_locale=no) + +if test x$enable_ipv6 = xyes; then + AC_MSG_CHECKING(for ipv6) + AC_EGREP_CPP([AP_maGiC_VALUE], + [ +#include +#include +#include +#ifdef PF_INET6 +#ifdef AF_INET6 +AP_maGiC_VALUE +#endif +#endif + ], + AC_DEFINE(HAVE_IPV6, 1, [Define if IPv6 support present]) + AC_MSG_RESULT([yes]), + AC_MSG_RESULT([no]) +) +fi + +enable_osx=no +case $host in + *-darwin*) + AC_DEFINE(HAVE_OSX, 1, [Define for compiling OS X support]) + MPD_LIBS="$MPD_LIBS -framework AudioUnit -framework CoreServices" + enable_osx=yes ;; +esac + +if test x$enable_shout = xyes; then + if test x$enable_oggvorbis = xno; then + AC_MSG_WARN([disabling shout streaming support because vorbis is not enabled]) + enable_shout=no + fi + if test x$use_tremor = xyes; then + AC_MSG_WARN([disabling shout streaming support because tremor does not support vorbis encoding]) + enable_shout=no + fi +fi + +if test x$enable_ao = xyes; then + XIPH_PATH_AO([AC_DEFINE(HAVE_AO, 1, [Define to play with ao]) MPD_LIBS="$MPD_LIBS $AO_LIBS" MPD_CFLAGS="$MPD_CFLAGS $AO_CFLAGS"], enable_ao=no) +fi + +if test x$enable_shout = xyes; then + XIPH_PATH_SHOUT([AC_DEFINE(HAVE_SHOUT, 1, [Define to enable libshout support]) MPD_LIBS="$MPD_LIBS $SHOUT_LIBS" MPD_CFLAGS="$MPD_CFLAGS $SHOUT_CFLAGS"], enable_shout=no) +fi + +if test x$enable_oss = xyes; then + AC_CHECK_HEADER(sys/soundcard.h,[enable_oss=yes;AC_DEFINE(HAVE_OSS,1,[Define to enable OSS])],[AC_MSG_WARN(Soundcard headers not found -- disabling OSS support);enable_oss=no]) +fi + +PKG_PROG_PKG_CONFIG + +if test x$enable_pulse = xyes; then + PKG_CHECK_MODULES([PULSE], [libpulse-simple], + [enable_pulse=yes;AC_DEFINE([HAVE_PULSE], 1, [Define to enable PulseAudio support])] MPD_LIBS="$MPD_LIBS $PULSE_LIBS" MPD_CFLAGS="$MPD_CFLAGS $PULSE_CFLAGS", + [enable_pulse=no;AC_MSG_WARN([PulseAudio not found -- disabling])]) +fi + +if test x$enable_lsr = xyes; then + PKG_CHECK_MODULES([SAMPLERATE], [samplerate >= 0.0.15], + [enable_lsr=yes;AC_DEFINE([HAVE_LIBSAMPLERATE], 1, [Define to enable libsamplerate])] MPD_LIBS="$MPD_LIBS $SAMPLERATE_LIBS" MPD_CFLAGS="$MPD_CFLAGS $SAMPLERATE_CFLAGS", + [enable_lsr=no;AC_MSG_WARN([libsamplerate not found -- disabling])]) +fi + +if test x$enable_fifo = xyes; then + AC_CHECK_FUNC([mkfifo], + [enable_fifo=yes;AC_DEFINE([HAVE_FIFO], 1, [Define to enable support for writing audio to a FIFO])], + [enable_fifo=no;AC_MSG_WARN([mkfifo not found -- disabling support for writing audio to a FIFO])]) +fi + +if test x$enable_mvp = xyes; then + AC_DEFINE(HAVE_MVP,1,[Define to enable Hauppauge Media MVP support]) +fi + +if test x$enable_alsa = xyes; then + AM_PATH_ALSA(0.9.0,[AC_DEFINE(HAVE_ALSA,1,[Define to enable ALSA support]) MPD_LIBS="$MPD_LIBS $ALSA_LIBS" MPD_CFLAGS="$MPD_CFLAGS $ALSA_CFLAGS"],enable_alsa=no) +fi + +if test x$enable_jack = xyes; then + PKG_CHECK_MODULES([JACK], [jack >= 0.4], + [enable_jack=yes;AC_DEFINE([HAVE_JACK], 1, [Define to enable JACK support])] MPD_LIBS="$MPD_LIBS $JACK_LIBS" MPD_CFLAGS="$MPD_CFLAGS $JACK_CFLAGS", + [enable_jack=no;AC_MSG_WARN([JACK not found -- disabling])]) +fi + +if test x$enable_iconv = xyes; then + if test "x$iconv_libraries" != "x" ; then + ICONV_LIBS="-L$iconv_libraries" + elif test "x$iconv_prefix" != "x" ; then + ICONV_LIBS="-L$iconv_prefix/lib" + fi + + ICONV_LIBS="$ICONV_LIBS -liconv" + + if test "x$iconv_includes" != "x" ; then + ICONV_CFLAGS="-I$iconv_includes" + elif test "x$iconv_prefix" != "x" ; then + ICONV_CFLAGS="-I$iconv_prefix/include" + fi + + oldcflags=$CFLAGS + oldlibs=$LIBS + oldcppflags=$CPPFLAGS + CFLAGS="$CFLAGS $MPD_CFLAGS $ICONV_CFLAGS" + LIBS="$LIBS $MPD_LIBS $ICONV_LIBS" + CPPFLAGS=$CFLAGS + AC_CHECK_HEADER(iconv.h,MPD_CFLAGS="$MPD_CFLAGS $ICONV_CFLAGS",enable_iconv=no) + if test x$enable_iconv = xyes; then + AC_CHECK_LIB(iconv,main,MPD_LIBS="$MPD_LIBS $ICONV_LIBS",) + AC_DEFINE(HAVE_ICONV,1,[Define to use iconv]) + fi + CFLAGS=$oldcflags + LIBS=$oldlibs + CPPFLAGS=$oldcppflags +fi + +ID3_SUBDIR="" + +if test x$enable_id3 = xyes; then + if test "x$id3tag_libraries" != "x" ; then + ID3TAG_LIBS="-L$id3tag_libraries" + elif test "x$id3tag_prefix" != "x" ; then + ID3TAG_LIBS="-L$id3tag_prefix/lib" + fi + + ID3TAG_LIBS="$ID3TAG_LIBS -lid3tag -lz" + + if test "x$id3tag_includes" != "x" ; then + ID3TAG_CFLAGS="-I$id3tag_includes" + elif test "x$id3tag_prefix" != "x" ; then + ID3TAG_CFLAGS="-I$id3tag_prefix/include" + fi + + ID3TAG_CFLAGS="$ID3TAG_CFLAGS" + + oldcflags=$CFLAGS + oldlibs=$LIBS + oldcppflags=$CPPFLAGS + CFLAGS="$CFLAGS $MPD_CFLAGS $ID3TAG_CFLAGS" + LIBS="$LIBS $MPD_LIBS $ID3TAG_LIBS" + CPPFLAGS=$CFLAGS + AC_CHECK_HEADERS(id3tag.h,use_libid3tag=yes, + [use_libid3tag=no]) + if test x$use_libid3tag = xyes; then + AC_CHECK_LIB(id3tag,id3_file_open, + [MPD_LIBS="$MPD_LIBS $ID3TAG_LIBS"; + MPD_CFLAGS="$MPD_CFLAGS $ID3TAG_CFLAGS"; + use_libid3tag=yes], + [use_libid3tag=no]) + fi + CFLAGS=$oldcflags + LIBS=$oldlibs + CPPFLAGS=$oldcppflags + if test x$use_libid3tag = xyes; then + AC_DEFINE(HAVE_ID3TAG,1,[Define to use id3tag]) + else + enable_id3=no + fi +fi + +MAD_SUBDIR="" + +if test x$enable_mp3 = xyes; then + if test "x$mad_libraries" != "x" ; then + MAD_LIBS="-L$mad_libraries" + elif test "x$mad_prefix" != "x" ; then + MAD_LIBS="-L$mad_prefix/lib" + fi + + MAD_LIBS="$MAD_LIBS -lmad" + + if test "x$mad_includes" != "x" ; then + MAD_CFLAGS="-I$mad_includes" + elif test "x$mad_prefix" != "x" ; then + MAD_CFLAGS="-I$mad_prefix/include" + fi + + oldcflags=$CFLAGS + oldlibs=$LIBS + oldcppflags=$CPPFLAGS + CFLAGS="$CFLAGS $MPD_CFLAGS $MAD_CFLAGS" + LIBS="$LIBS $MPD_LIBS $MAD_LIBS" + CPPFLAGS=$CFLAGS + AC_CHECK_HEADERS(mad.h,use_libmad=yes, + [use_libmad=no]) + if test x$use_libmad = xyes; then + AC_CHECK_LIB(mad,mad_stream_init,[MPD_LIBS="$MPD_LIBS $MAD_LIBS"; + MPD_CFLAGS="$MPD_CFLAGS $MAD_CFLAGS"; + use_libmad=yes],[use_libmad=no]) + fi + CFLAGS=$oldcflags + LIBS=$oldlibs + CPPFLAGS=$oldcppflags + if test x$use_libmad = xyes; then + AC_DEFINE(HAVE_MAD,1,[Define to use libmad]) + else + enable_mp3=no + fi +fi + +if test x$enable_mpc = xyes; then + if test "x$mpcdec_libraries" != "x" ; then + MPCDEC_LIBS="-L$mpcdec_libraries" + elif test "x$mpcdec_prefix" != "x" ; then + MPCDEC_LIBS="-L$mpcdec_prefix/lib" + fi + + MPCDEC_LIBS="$MPCDEC_LIBS -lmpcdec" + + if test "x$mpcdec_includes" != "x" ; then + MPCDEC_CFLAGS="-I$mpcdec_includes" + elif test "x$mpcdec_prefix" != "x" ; then + MPCDEC_CFLAGS="-I$mpcdec_prefix/include" + fi + + oldcflags=$CFLAGS + oldlibs=$LIBS + oldcppflags=$CPPFLAGS + CFLAGS="$CFLAGS $MPD_CFLAGS $MPCDEC_CFLAGS -I." + LIBS="$LIBS $MPD_LIBS $MPCDEC_LIBS" + CPPFLAGS=$CFLAGS + AC_CHECK_HEADER(mpcdec/mpcdec.h,,enable_mpc=no) + if test x$enable_mpc = xyes; then + AC_CHECK_LIB(mpcdec,main,[MPD_LIBS="$MPD_LIBS $MPCDEC_LIBS";MPD_CFLAGS="$MPD_CFLAGS $MPCDEC_CFLAGS";],enable_mpc=no) + fi + if test x$enable_mpc = xyes; then + AC_DEFINE(HAVE_MPCDEC,1,[Define to use libmpcdec for MPC decoding]) + else + AC_MSG_WARN([mpcdec lib needed for MPC support -- disabling MPC support]) + fi + CFLAGS=$oldcflags + LIBS=$oldlibs + CPPFLAGS=$oldcppflags +fi + +if test x$enable_wavpack = xyes; then + PKG_CHECK_MODULES([WAVPACK], [wavpack], + [enable_wavpack=yes;AC_DEFINE([HAVE_WAVPACK], 1, [Define to enable WavPack support])] MPD_LIBS="$MPD_LIBS $WAVPACK_LIBS" MPD_CFLAGS="$MPD_CFLAGS $WAVPACK_CFLAGS", + [enable_wavpack=no;AC_MSG_WARN([WavPack not found -- disabling])]) +fi + +MP4FF_SUBDIR="" + +if test x$enable_aac = xyes; then + if test "x$faad_libraries" != "x" ; then + FAAD_LIBS="-L$faad_libraries" + elif test "x$faad_prefix" != "x" ; then + FAAD_LIBS="-L$faad_prefix/lib" + fi + + FAAD_LIBS="$FAAD_LIBS -lfaad" + + if test "x$faad_includes" != "x" ; then + FAAD_CFLAGS="-I$faad_includes" + elif test "x$faad_prefix" != "x" ; then + FAAD_CFLAGS="-I$faad_prefix/include" + fi + + oldcflags=$CFLAGS + oldlibs=$LIBS + oldcppflags=$CPPFLAGS + CFLAGS="$CFLAGS $MPD_CFLAGS $FAAD_CFLAGS -I." + LIBS="$LIBS $MPD_LIBS $FAAD_LIBS" + CPPFLAGS=$CFLAGS + AC_CHECK_HEADER(faad.h,,enable_aac=no) + if test x$enable_aac = xyes; then + AC_CHECK_DECL(FAAD2_VERSION,,enable_aac=no,[#include ]) + fi + if test x$enable_aac = xyes; then + AC_CHECK_DECL(faacDecInit2,,enable_aac=no,[#include ]) + fi + if test x$enable_aac = xyes; then + AC_CHECK_LIB(faad,faacDecInit2,[MPD_LIBS="$MPD_LIBS $FAAD_LIBS";MPD_CFLAGS="$MPD_CFLAGS $FAAD_CFLAGS";MP4FF_SUBDIR="mp4ff";MP4FF_LIB="mp4ff/libmp4ff.la"],enable_aac=no) + if test x$enable_aac = xno; then + enable_aac=yes + AC_CHECK_LIB(faad,NeAACDecInit2,[MPD_LIBS="$MPD_LIBS $FAAD_LIBS";MPD_CFLAGS="$MPD_CFLAGS $FAAD_CFLAGS";MP4FF_SUBDIR="mp4ff";MP4FF_LIB="mp4ff/libmp4ff.la"],enable_aac=no) + fi + fi + if test x$enable_aac = xyes; then + AC_MSG_CHECKING(that FAAD2 uses buffer and bufferlen) + AC_COMPILE_IFELSE([ +#include + +int main() { + char buffer; + long bufferlen = 0; + faacDecHandle decoder; + faacDecFrameInfo frameInfo; + faacDecConfigurationPtr config; + unsigned char channels; + long sampleRate; + mp4AudioSpecificConfig mp4ASC; + + decoder = faacDecOpen(); + config = faacDecGetCurrentConfiguration(decoder); + config->outputFormat = FAAD_FMT_16BIT; + faacDecSetConfiguration(decoder,config); + AudioSpecificConfig(&buffer, bufferlen, &mp4ASC); + faacDecInit(decoder,&buffer,bufferlen,&sampleRate,&channels); + faacDecInit2(decoder,&buffer,bufferlen,&sampleRate,&channels); + faacDecDecode(decoder,&frameInfo,&buffer,bufferlen); + + return 0; +} +],[AC_MSG_RESULT(yes);AC_DEFINE(HAVE_FAAD_BUFLEN_FUNCS,1,[Define if FAAD2 uses buflen in function calls])],[AC_MSG_RESULT(no); + AC_MSG_CHECKING(that FAAD2 can even be used) + AC_COMPILE_IFELSE([ +#include + +int main() { + char buffer; + faacDecHandle decoder; + faacDecFrameInfo frameInfo; + faacDecConfigurationPtr config; + unsigned char channels; + long sampleRate; + long bufferlen = 0; + unsigned long dummy1_32; + unsigned char dummy2_8, dummy3_8, dummy4_8, dummy5_8, dummy6_8, + dummy7_8, dummy8_8; + + decoder = faacDecOpen(); + config = faacDecGetCurrentConfiguration(decoder); + config->outputFormat = FAAD_FMT_16BIT; + faacDecSetConfiguration(decoder,config); + AudioSpecificConfig(&buffer,&dummy1_32,&dummy2_8, + &dummy3_8,&dummy4_8,&dummy5_8, + &dummy6_8,&dummy7_8,&dummy8_8); + faacDecInit(decoder,&buffer,&sampleRate,&channels); + faacDecInit2(decoder,&buffer,bufferlen,&sampleRate,&channels); + faacDecDecode(decoder,&frameInfo,&buffer); + faacDecClose(decoder); + + return 0; +} +],AC_MSG_RESULT(yes),[AC_MSG_RESULT(no);enable_aac=no]) + ]) + fi + if test x$enable_aac = xyes; then + AC_CHECK_TYPES(mp4AudioSpecificConfig,,,[#include ]) + AC_CHECK_MEMBERS([faacDecConfiguration.downMatrix,faacDecConfiguration.dontUpSampleImplicitSBR,faacDecFrameInfo.samplerate],,,[#include ]) + AC_DEFINE(HAVE_FAAD,1,[Define to use FAAD2 for AAC decoding]) + else + AC_MSG_WARN([faad2 lib needed for MP4/AAC support -- disabling MP4/AAC support]) + fi + CFLAGS=$oldcflags + LIBS=$oldlibs + CPPFLAGS=$oldcppflags +fi + +if test x$use_tremor = xyes; then + if test "x$tremor_libraries" != "x" ; then + TREMOR_LIBS="-L$tremor_libraries" + elif test "x$tremor_prefix" != "x" ; then + TREMOR_LIBS="-L$tremor_prefix/lib" + fi + TREMOR_LIBS="$TREMOR_LIBS -lvorbisidec" + if test "x$tremor_includes" != "x" ; then + TREMOR_CFLAGS="-I$tremor_includes" + elif test "x$tremor_prefix" != "x" ; then + TREMOR_CFLAGS="-I$tremor_prefix/include" + fi + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $TREMOR_CFLAGS" + LIBS="$LIBS $TREMOR_LIBS" + AC_CHECK_LIB(vorbisidec,ov_read,enable_oggvorbis=yes,enable_oggvorbis=no;AC_MSG_WARN([vorbisidec lib needed for ogg support with tremor -- disabling ogg support])) + if test x$enable_oggvorbis = xno; then + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi +elif test x$enable_oggvorbis = xyes; then + XIPH_PATH_OGG(,enable_oggvorbis=no) + XIPH_PATH_VORBIS(,enable_oggvorbis=no) + if test x$enable_oggvorbis = xyes; then + MPD_LIBS="$MPD_LIBS $OGG_LIBS $VORBIS_LIBS $VORBISFILE_LIBS" + MPD_CFLAGS="$MPD_CFLAGS $OGG_CFLAGS $VORBIS_CFLAGS" + + if test x$enable_shout = xyes; then + MPD_LIBS="$MPD_LIBS $VORBISENC_LIBS" + MPD_CFLAGS="$MPD_CFLAGS $VORBISFILE_CFLAGS $VORBISENC_CFLAGS" + fi + fi +fi + +if test x$enable_oggvorbis = xyes; then + AC_DEFINE(HAVE_OGGVORBIS,1,[Define for Ogg Vorbis support]) +fi + +if test x$use_tremor = xyes; then + AC_DEFINE(HAVE_TREMOR,1,[Define to use tremor (libvorbisidec) for ogg support]) + if test x$enable_oggflac = xyes; then + AC_MSG_WARN([disabling OggFLAC support because it is incompatible with tremor]) + enable_oggflac=no + fi +fi + +if test x$enable_flac = xyes; then + oldmpdcflags="$MPD_CFLAGS" + oldmpdlibs="$MPD_LIBS" + AM_PATH_LIBFLAC(MPD_LIBS="$MPD_LIBS $LIBFLAC_LIBS" MPD_CFLAGS="$MPD_CFLAGS $LIBFLAC_CFLAGS",enable_flac=no) +fi + + +if test x$enable_flac = xyes; then + oldcflags="$CFLAGS" + oldlibs="$LIBS" + CFLAGS="$CFLAGS $MPD_CFLAGS" + LIBS="$LIBS $MPD_LIBS" + AC_CHECK_LIB(FLAC, FLAC__metadata_object_vorbiscomment_find_entry_from, + ,[enable_flac=no;AC_MSG_WARN(You need FLAC 1.1 -- disabling flac support)]) + if test x$enable_flac = xno; then + MPD_CFLAGS="$oldmpdcflags" + MPD_LIBS="$oldmpdlibs" + else + AC_CHECK_DECL(FLAC_API_SUPPORTS_OGG_FLAC, + [enable_oggflac=flac], [], + [#include ]) + fi + CFLAGS="$oldcflags" + LIBS="$oldlibs" +fi + + +if test x$enable_flac = xyes; then + AC_DEFINE(HAVE_FLAC,1,[Define for FLAC support]) +fi + + +if test x$enable_oggflac = xyes; then + oldmpdcflags="$MPD_CFLAGS" + oldmpdlibs="$MPD_LIBS" + AM_PATH_LIBOGGFLAC(MPD_LIBS="$MPD_LIBS $LIBOGGFLAC_LIBS" MPD_CFLAGS="$MPD_CFLAGS $LIBOGGFLAC_CFLAGS",enable_oggflac=no) +fi + +if test x$enable_oggflac = xyes; then + AC_DEFINE(HAVE_OGGFLAC,1,[Define for OggFLAC support]) +fi + + +if test x$enable_audiofile = xyes; then + AM_PATH_AUDIOFILE(0.1.7, MPD_LIBS="$MPD_LIBS $AUDIOFILE_LIBS" MPD_CFLAGS="$MPD_CFLAGS $AUDIOFILE_CFLAGS", + [enable_audiofile=no;AC_MSG_WARN(You need audiofile -- disabling audiofile support)]) +fi + +if test x$enable_audiofile = xyes; then + AC_DEFINE(HAVE_AUDIOFILE,1,[Define for audiofile support]) +fi + +if test x$enable_mod = xyes; then + AM_PATH_LIBMIKMOD(3.1.7, MPD_CFLAGS="$MPD_CFLAGS $LIBMIKMOD_CFLAGS" + MPD_LIBS="$MPD_LIBS $LIBMIKMOD_LIBS $LIBMIKMOD_LDADD", enable_mod=no) + if test x$enable_mod = xyes; then + AC_DEFINE(HAVE_MIKMOD, 1, [Define for mikmod support]) + fi +fi + +case $with_zeroconf in +no|avahi|bonjour) + ;; +*) + with_zeroconf=auto + ;; +esac + +if test x$with_zeroconf != xno; then + if test x$with_zeroconf = xavahi || test x$with_zeroconf = xauto; then + PKG_CHECK_MODULES([AVAHI], [avahi-client], + [found_avahi=1;AC_DEFINE([HAVE_AVAHI], 1, [Define to enable Avahi Zeroconf support])] + MPD_LIBS="$MPD_LIBS $AVAHI_LIBS" MPD_CFLAGS="$MPD_CFLAGS $AVAHI_CFLAGS", + [found_avahi=0]) + fi + + if test x$found_avahi = x1; then + with_zeroconf=avahi + elif test x$with_zeroconf = xavahi; then + with_zeroconf=no + fi + + if test x$with_zeroconf = xbonjour || test x$with_zeroconf = xauto; then + AC_CHECK_HEADER(dns_sd.h, + [found_bonjour=1;AC_DEFINE([HAVE_BONJOUR], 1, [Define to enable Bonjour Zeroconf support])], + [found_bonjour=0]) + AC_CHECK_LIB(dns_sd, DNSServiceRegister, + MPD_LIBS="$MPD_LIBS -ldns_sd") + fi + + if test x$found_bonjour = x1; then + with_zeroconf=bonjour + elif test x$with_zeroconf = xbonjour; then + with_zeroconf=no + fi + + if test x$with_zeroconf = xauto || test x$with_zeroconf = xno; then + AC_MSG_WARN([No supported Zeroconf backend found, disabling Zeroconf]) + with_zeroconf=no + else + AC_DEFINE([HAVE_ZEROCONF], 1, [Define to enable Zeroconf support]) + fi +fi + +AC_OUTPUT(src/mp4ff/Makefile doc/Makefile src/Makefile Makefile ) + +echo "" +echo "########### MPD CONFIGURATION ############" +echo "" + +echo " Playback Support:" +if test x$enable_ao = xyes; then + echo " libao support .................enabled" +else + echo " libao support .................disabled" +fi + +if test x$enable_oss = xyes; then + echo " OSS support ...................enabled" +else + echo " OSS support ...................disabled" +fi + +if test x$enable_alsa = xyes; then + echo " ALSA support ..................enabled" +else + echo " ALSA support ..................disabled" +fi + +if test x$enable_jack = xyes; then + echo " JACK support ..................enabled" +else + echo " JACK support ..................disabled" +fi + +if test x$enable_osx = xyes; then + echo " OS X support ..................enabled" +else + echo " OS X support ..................disabled" +fi + +if test x$enable_pulse = xyes; then + echo " PulseAudio support ............enabled" +else + echo " PulseAudio support ............disabled" +fi + +if test x$enable_fifo = xyes; then + echo " FIFO support ..................enabled" +else + echo " FIFO support ..................disabled" +fi + +if test x$enable_mvp = xyes; then + echo " Media MVP support .............enabled" +else + echo " Media MVP support .............disabled" +fi + +if test x$enable_shout = xyes; then + echo " Shout streaming support .......enabled" +else + echo " Shout streaming support .......disabled" +fi + +echo "" + +if test x$enable_ao = xno && + test x$enable_oss = xno && + test x$enable_shout = xno && + test x$enable_alsa = xno && + test x$enable_osx = xno && + test x$enable_pulse = xno && + test x$enable_jack = xno && + test x$enable_fifo = xno && + test x$enable_mvp = xno; then + AC_MSG_ERROR([No Audio Output types configured!]) +fi + +echo " File Format Support:" + +if test x$enable_id3 = xyes; then + echo " ID3 tag support ...............enabled" +else + echo " ID3 tag support ...............disabled" +fi + +if test x$enable_mp3 = xyes; then + echo " mp3 support ...................enabled" +else + echo " mp3 support ...................disabled" +fi + +if test x$enable_oggvorbis = xyes; then + echo " Ogg Vorbis support ............enabled" + if test x$use_tremor = xyes; then + echo " using tremor.................yes" + else + echo " using tremor.................no" + fi +else + echo " Ogg Vorbis support ............disabled" +fi + +if test x$enable_flac = xyes; then + echo " FLAC support ..................enabled" +else + echo " FLAC support ..................disabled" +fi + +case $enable_oggflac in +yes) + echo " OggFLAC support ...............enabled" + ;; +flac) + echo " OggFLAC support ...............enabled(FLAC 1.1.3)" + ;; +*) + echo " OggFLAC support ...............disabled" + ;; +esac + +if test x$enable_audiofile = xyes; then + echo " Wave file support .............enabled" +else + echo " Wave file support .............disabled" +fi + +if test x$enable_aac = xyes; then + echo " MP4/AAC support ...............enabled" +else + echo " MP4/AAC support ...............disabled" +fi + +if test x$enable_mpc = xyes; then + echo " Musepack (MPC) support ........enabled" +else + echo " Musepack (MPC) support ........disabled" +fi + +if test x$enable_wavpack = xyes; then + echo " WavPack support ...............enabled" +else + echo " WavPack support ...............disabled" +fi + +if test x$enable_mod = xyes; then + echo " MOD support ...................enabled" +else + echo " MOD support ...................disabled" +fi + +if + test x$enable_mp3 = xno && + test x$enable_oggvorbis = xno && + test x$enable_flac = xno && + test x$enable_oggflac = xno && + test x$enable_audiofile = xno && + test x$enable_aac = xno && + test x$enable_mpc = xno && + test x$enable_wavpack = xno && + test x$enable_mod = xno; then + AC_MSG_ERROR([No input plugins supported!]) +fi + +echo "" +echo " Other features:" + +if test x$enable_lsr = xyes; then + echo " libsamplerate support .........enabled" +else + echo " libsamplerate support .........disabled" +fi + + +if test x$with_zeroconf != xno; then + echo " Zeroconf support ..............$with_zeroconf" +else + echo " Zeroconf support ..............disabled" +fi + +echo "" +echo "##########################################" +echo "" +echo "You are now ready to compile MPD" +echo "Type \"make\" to compile MPD" diff --git a/doc/.svn/all-wcprops b/doc/.svn/all-wcprops new file mode 100644 index 0000000..28a726a --- /dev/null +++ b/doc/.svn/all-wcprops @@ -0,0 +1,35 @@ +K 25 +svn:wc:ra_dav:version-url +V 37 +/!svn/ver/6756/mpd/branches/q-mpd/doc +END +mpd.1 +K 25 +svn:wc:ra_dav:version-url +V 43 +/!svn/ver/6756/mpd/branches/q-mpd/doc/mpd.1 +END +mpdconf.example +K 25 +svn:wc:ra_dav:version-url +V 53 +/!svn/ver/6756/mpd/branches/q-mpd/doc/mpdconf.example +END +COMMANDS +K 25 +svn:wc:ra_dav:version-url +V 46 +/!svn/ver/6756/mpd/branches/q-mpd/doc/COMMANDS +END +mpd.conf.5 +K 25 +svn:wc:ra_dav:version-url +V 48 +/!svn/ver/6756/mpd/branches/q-mpd/doc/mpd.conf.5 +END +Makefile.am +K 25 +svn:wc:ra_dav:version-url +V 49 +/!svn/ver/6756/mpd/branches/q-mpd/doc/Makefile.am +END diff --git a/doc/.svn/entries b/doc/.svn/entries new file mode 100644 index 0000000..cf6a40d --- /dev/null +++ b/doc/.svn/entries @@ -0,0 +1,88 @@ +8 + +dir +6759 +https://svn.musicpd.org/mpd/branches/q-mpd/doc +https://svn.musicpd.org + + + +2007-06-13T14:15:30.994451Z +6621 +jat + + +svn:special svn:externals svn:needs-lock + + + + + + + + + + + +09075e82-0dd4-0310-85a5-a0d7c8717e4f + +mpd.1 +file + + + + +2007-08-19T16:45:15.000000Z +7533289bac036d9353ab38b11c849192 +2006-07-14T19:37:45.685073Z +4333 +jat + +mpdconf.example +file + + + + +2007-08-19T16:45:15.000000Z +205516fec681b8205014772a20ac6508 +2007-06-12T18:28:57.882618Z +6556 +jat + +COMMANDS +file + + + + +2007-08-19T16:45:15.000000Z +f0f1c310a9a852098f917faf119bba33 +2006-08-08T18:55:29.546621Z +4602 +jat + +mpd.conf.5 +file + + + + +2007-08-19T16:45:15.000000Z +833003a31f49210d632bae36cf550faf +2007-06-13T14:15:30.994451Z +6621 +jat + +Makefile.am +file + + + + +2007-08-19T16:45:15.000000Z +813bf7d318b3a27924219546014facc8 +2006-06-04T20:05:30.438531Z +4248 +jat + diff --git a/doc/.svn/format b/doc/.svn/format new file mode 100644 index 0000000..45a4fb7 --- /dev/null +++ b/doc/.svn/format @@ -0,0 +1 @@ +8 diff --git a/doc/.svn/text-base/COMMANDS.svn-base b/doc/.svn/text-base/COMMANDS.svn-base new file mode 100644 index 0000000..652e315 --- /dev/null +++ b/doc/.svn/text-base/COMMANDS.svn-base @@ -0,0 +1,275 @@ + Music Player Daemon - Commands + + WARNING + This document has not been updated to reflect recent changes in + the MPD protocol. It does not contain all supported commands, + and some commands may now take additional arguments. However, + clients conforming to this specification should still be + compatible with the latest release of MPD. For more up to date + documentation, please see the protocol reference on the wiki at + . + +This document is intended for client developers, not end users. + +Format: +------- + +If arguments contain spaces, they should be surrounded by double quotation +marks, ". + +command ... + explanation: w/ arg1 and arg2 + +All data between the client and server is encoded in UTF-8. (Note, +that in UTF-8 all standard ansi characters, 0-127, are the same as a standard +ansi encoding. Also, no ansi character appears in any multi-byte +characters. So, you can use standard C functions like strlen, and strcpy +just fine with UTF-8 encoded strings. For example: "OK\n" encoded in UTF-8 is +simply "OK\n". For more information on UTF=8: +http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 ) + +Command Completion: +------------------- + +A command returns "OK\n" on completion or "ACK some error\n" on failure. +These denote the end of command execution. + +NOTE: +----- + +For manipulating playlists and playing, there are two sets of commands. One +set uses the song id of a song in the playlist, while another set uses the +playlist position of the song. The commands using song id's should be used +instead of the commands that manipulate and control playback based on playlist +position. Using song id's is a safer method when multiple clients are +interacting with MPD. + +Commands: +--------- + +add + add the file _path_ to the playlist (directories add recursively) + _path_ can also be a single file + increments playlist version by for each song added + +clear + clears the current playlist + increments playlist version by 1 + +clearerror + clear the current error message in status + (this is also accomplished by any command that starts playback) + +close + close the connection with the MPD + +crossfade + sets crossfading between songs + +currentsong + displays the song info of current song (same song that is identified + in status) + +delete + delete _song_ from playlist + increments playlist version by 1 + +deleteid + delete song with _songid_ from playlist + increments playlist version by 1 + +find + finds songs in the db that are exactly _what_ + _type_ should be "album", "artist", or "title" + _what_ is what to find + +kill + kill MPD + +list + list all tags of _type_ + _type_ should be "album" or "artist" + _arg1_ is an optional parameter when type is album, this specifies + to list albums by a artist, where artist is specified with + arg1 + +listall + lists all songs and directories in _path_ (recursively) + _path_ is optional and maybe a directory or path + +listallinfo + same as listall command, except it also returns metadata info + in the same format as lsinfo + +load + loads the playlist _name_.m3u from the playlist directory + increments playlist version by the number of songs added + +lsinfo + list contents of _directory_, from the db. _directory_ is optional + +move + move song at _from_ to _to_ in the playlist + increments playlist version by 1 + +moveid + move song with _songid_ to _to_ in the playlist + increments playlist version by 1 + +next + plays next song in playlist + +pause + toggle pause/resume playing + _pause_ is required and should be 0 or 1 + NOTE: use of pause command w/o the _pause_ argument is deprecated + +password + this is used for authentication with the server. + _password_ is simply the plaintext password + +ping + does nothing but return "OK" + +play + begin playing playlist at song number _song_, _song_ is optional + +playid + begin playing playlist at song with _songid_, _songid_ is optional + +playlist + displays the current playlist + NOTE: do not use this, instead use 'playlistinfo' + +playlistinfo + displays list of songs in the playlist + _song_ is optional and specifies a single song to display info for + +playlistid + displays list of songs in the playlist + _songid_ is optional and specifies a single song to display info for + +plchanges + displays changed songs currently in the playlist since + _playlist version_ + NOTE: to detect songs that were deleted at the end of the playlist, + use playlistlength returned by status command. + +plchangesposid + displays changed songs currently in the playlist since + _playlist version_ + This function only returns the position and the id of the changed song, not the complete metadata. This is more bandwidth efficient. + NOTE: to detect songs that were deleted at the end of the playlist, + use playlistlength returned by status command. + +previous + plays previous song in playlist + +random + set random state to _state_, _state_ should be 0 or 1 + +repeat + set repeat state to _state_, _state_ should be 0 or 1 + +rm + removes the playlist .m3u from the playlist directory + +save + saves the current playlist to _name_.m3u in the playlist directory + +search + searches for any song that contain _what_ + _type_ can be "title","artist","album", or "filename" + search is not case sensitive + +seek + seeks to the position _time_ (in seconds) of entry _song_ in the + playlist + +seekid + seeks to the position _time_ (in seconds) of song with _songid_ + +setvol + set volume to _vol_ + _vol_ the range of volume is 0-100 + +shuffle + shuffles the current playlist + increments playlist version by 1 + +stats + display stats + artists: number of artists + albums: number of albums + songs: number of songs + uptime: daemon uptime in seconds + db_playtime: sum of all song times in db + db_update: last db update in UNIX time + playtime: time length of music played + +status + reports current status of player, and volume level. + volume: (0-100). + repeat: (0 or 1) + playlist: (31-bit unsigned integer, the playlist version number) + playlistlength: (integer, the length of the playlist) + state: ("play", "stop", or "pause") + song: (current song stopped on or playing, playlist song number) + songid: (current song stopped on or playing, playlist songid) + time: :