aboutsummaryrefslogtreecommitdiffstats
path: root/doc/mpdconf.example (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://git.musicpd.org/avuton/mpdMax Kellermann2008-12-211-171/+196
|\ | | | | | | | | | | Conflicts: doc/mpdconf.example
| * Huge mpdconf update.Avuton Olrich2008-12-201-175/+198
| | | | | | | | | | | | | | Over time mpdconf has evolved and has been maintained and contributed to by many different folks at different times. Try to give it some unity. Attempt to clear up some language and make things crystal clear. Add more examples. Use tabs when it makes sense. Make better borders. Remove obsolete options. Try to put more defaults when it makes sense.
* | doc: clarify "user" setting (starting as root / unprivileged)Max Kellermann2008-12-201-4/+4
|/ | | | | The "user" option does not work if MPD is started by an unprivileged user.
* man: document Unix domain socket configuration in the manualMax Kellermann2008-12-161-0/+4
| | | | Additionally, add an example in mpdconf.example.
* update: default to follow all symlinksAvuton Olrich2008-12-081-1/+1
| | | | | | MPD 0.13 and older followed all symbolic links. Although this can be a security problem (as it has always been), 0.14 should offer the same default behaviour as 0.13.
* update: added options which control symlink behaviourRaphaël Rigo2008-11-281-0/+2
| | | | | | | | | The configuration options "follow_outside_symlinks" and "follow_inside_symlinks" let the user control whether MPD should follow symbolic links in the music directory. [mk: converted variables to "bool"; moved configuration to update_global_init()]
* update mpdconf.example that shout ouput encoding and protocol settings are ↵Alam Arias2008-10-311-2/+2
| | | | optional
* replace tabs with space in shout audio_output exampleAlam Arias2008-10-311-1/+1
|
* shout: make the protocol configurableAaron McEwan2008-10-121-0/+1
| | | | | Added configuration parameter "protocol" which lets the user choose from 3 shout protocols. This adds support for real shoutcast servers.
* shout: introduce pluggable encoder APIEric Wollesen2008-09-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've perhaps gone a bit overboard, but here's the current rundown: Both Ogg and MP3 use the "shout" audio output plugin. The shout audio output plugin itself has two new plugins, one for the Ogg encoder, and another for the MP3 (LAME) encoder. Configuration for an Ogg stream doesn't change. For an MP3 stream, configuration is the same as Ogg, with two exceptions. First, you must specify the optional "encoding" parameter, which should be set to "mp3". See mpd.conf(5) for more details. Second, the "quality" parameter is reversed for LAME, such that 1 is high quality for LAME, whereas 10 is high quality for Ogg. I've decomposed the code so that all libshout related operations are done in audioOutput_shout.c, all Ogg specific functions are in audioOutput_shout_ogg.c, and of course then all LAME specific functions are handled in audioOutput_shout_mp3.c. To develop encoder plugins for the shout audio output plugin, I basically just mimicked the plugin system used for audio outputs. This might be overkill, but hopefully if anyone ever wants to support some other sort of stream, like maybe AAC, FLAC, or WMA (hey it could happen), they will hopefully be all set. The Ogg encoder is slightly less optimal under this configuration. It used to send shout data directly out of its ogg_page structures. Now, in the interest of encapsulation, it copies the data from its ogg_page structures into a buffer provided by the shout audio output plugin (see audioOutput_shout_ogg.c, line 77.) I suspect the performance impact is negligible. As for metadata, I'm pretty sure they'll both work. I wrote up a test scaffold that would create a fake tag, and tell the plugin to send it out to the stream every few seconds. It seemed to work fine. Of course, if something does break, I'll be glad to fix it. Lastly, I've renamed lots of things into snake_case, in keeping with normalperson's wishes in that regard. [mk: moved the MP3 patch after this one. Splitted this patch into several parts; the others were already applied before this one. Fixed a bunch GCC warnings and wrong whitespace modifications. Made it compile with mpd-mk by adapting to its prototypes]
* Make the shout timeout configurable. The default is still 2 seconds.J. Alexander Treuman2007-06-121-0/+1
| | | git-svn-id: https://svn.musicpd.org/mpd/trunk@6556 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* Adding ChangeLog entry for zeroconf_enabled, adding Zeroconf section toJ. Alexander Treuman2007-06-031-4/+8
| | | | | mpdconf.example, and updating the zeroconf_* docs. git-svn-id: https://svn.musicpd.org/mpd/trunk@6474 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* allow zeroconf to be disabled.Patrik Weiskircher2007-06-031-0/+4
| | | git-svn-id: https://svn.musicpd.org/mpd/trunk@6467 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* Adding a null output to mpdconf.example.J. Alexander Treuman2007-05-301-0/+7
| | | git-svn-id: https://svn.musicpd.org/mpd/trunk@6394 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* Increasing default buffer_before_play from 0% to 10%.J. Alexander Treuman2007-05-271-1/+1
| | | git-svn-id: https://svn.musicpd.org/mpd/trunk@6290 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* Adding a note to mpdconf.example about increasing buffer_before_play if youJ. Alexander Treuman2007-05-231-0/+1
| | | | | hear skipping when changing songs. git-svn-id: https://svn.musicpd.org/mpd/trunk@6240 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* Updating metadata_to_use docs to be more consistent with tagtypes command.J. Alexander Treuman2007-03-311-1/+2
| | | git-svn-id: https://svn.musicpd.org/mpd/trunk@5793 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* Tidying up libsamplerate example in mpdconf.example.J. Alexander Treuman2007-02-131-4/+5
| | | git-svn-id: https://svn.musicpd.org/mpd/trunk@5333 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* Add libsamplerate support, old resampling is still an option, but this ↵Avuton Olrich2007-02-021-0/+6
| | | | | sounds much better for those who need it and don't want to use pulseaudio. Reviewed by shank/avuton. git-svn-id: https://svn.musicpd.org/mpd/trunk@5316 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* Added zeroconf service publishing using avahiJim Ramsay2007-01-111-0/+6
| | | git-svn-id: https://svn.musicpd.org/mpd/trunk@5238 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* Adding documentation for gapless_mp3_playback config option.J. Alexander Treuman2006-12-231-2/+10
| | | git-svn-id: https://svn.musicpd.org/mpd/trunk@5158 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* Filling in link to wiki for audio outputs in mpdconf.exampleJ. Alexander Treuman2006-09-151-2/+2
| | | git-svn-id: https://svn.musicpd.org/mpd/trunk@4776 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* I can't believe qball is correcting my typos.J. Alexander Treuman2006-09-131-1/+1
| | | git-svn-id: https://svn.musicpd.org/mpd/trunk@4771 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* Typo found by bensonk.J. Alexander Treuman2006-09-121-1/+1
| | | git-svn-id: https://svn.musicpd.org/mpd/trunk@4769 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* New example config.J. Alexander Treuman2006-09-121-171/+173
| | | git-svn-id: https://svn.musicpd.org/mpd/trunk@4768 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* Adding on the fly volume normalization support. Code originally from ↵J. Alexander Treuman2006-07-221-1/+8
| | | | | mplayer, ported by syscrash, cleaned up by avuton, and further cleaned up by me (jat). git-svn-id: https://svn.musicpd.org/mpd/trunk@4424 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* Fix more shank typos in mpdconf.example. Thanks to ves for reporting them.J. Alexander Treuman2006-07-161-2/+2
| | | git-svn-id: https://svn.musicpd.org/mpd/trunk@4358 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* Typo.J. Alexander Treuman2006-06-301-1/+1
| | | git-svn-id: https://svn.musicpd.org/mpd/trunk@4293 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* Add back the id3v1_encoding option. Now it really will convert id3v1 only.J. Alexander Treuman2006-06-211-0/+4
| | | git-svn-id: https://svn.musicpd.org/mpd/trunk@4282 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* fix title->track in config file replaygain exampleQball Cow2006-01-141-1/+1
| | | git-svn-id: https://svn.musicpd.org/mpd/trunk@3827 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* remove unnecessary apostropheEric Wong2005-07-311-1/+1
| | | git-svn-id: https://svn.musicpd.org/mpd/trunk@3410 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* change the default max_output_buffer_size from 2048 to 8192Warren Dukes2005-04-271-1/+1
| | | git-svn-id: https://svn.musicpd.org/mpd/trunk@3226 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* update config fileWarren Dukes2005-03-121-9/+10
| | | git-svn-id: https://svn.musicpd.org/mpd/trunk@3060 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* *) add support for pid filesWarren Dukes2005-03-091-0/+1
| | | | | | | *) we now require pid_file to specified in the config *) new prefered method for killing mpd: mpd --kill *) cleaned up some nastiness with decode_pid handling git-svn-id: https://svn.musicpd.org/mpd/trunk@3042 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* config file change! now 'port' is optional and 'db_file' is required!Warren Dukes2005-03-061-6/+4
| | | | | | also, should have better error reporting when failing to open playlist or music directory's, or writing the db, etc git-svn-id: https://svn.musicpd.org/mpd/trunk@3027 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* sample config file exampleWarren Dukes2005-03-061-0/+3
| | | git-svn-id: https://svn.musicpd.org/mpd/trunk@3026 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* added composer, performer, and comment metadata itemsWarren Dukes2005-03-051-7/+6
| | | git-svn-id: https://svn.musicpd.org/mpd/trunk@3022 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* merge changes from metadata-rewrite branchWarren Dukes2004-11-101-0/+4
| | | git-svn-id: https://svn.musicpd.org/mpd/trunk@2589 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* add "genre" and "description" to shout config parametersWarren Dukes2004-11-091-1/+5
| | | git-svn-id: https://svn.musicpd.org/mpd/trunk@2557 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* update mpdconf.exampleWarren Dukes2004-11-061-1/+3
| | | git-svn-id: https://svn.musicpd.org/mpd/trunk@2527 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* update default mpdconf.example to use default ao outputWarren Dukes2004-10-291-59/+61
| | | git-svn-id: https://svn.musicpd.org/mpd/trunk@2407 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* merge shank-rewrite-config changesWarren Dukes2004-10-281-35/+31
| | | git-svn-id: https://svn.musicpd.org/mpd/trunk@2375 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* Added ao_driver options to help the user pick what they need, also told to ↵Avuton Olrich2004-10-261-0/+16
| | | | | refer to libao docs for more info git-svn-id: https://svn.musicpd.org/mpd/trunk@2350 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* add shout* stuff to exampe mpd config fileWarren Dukes2004-10-261-0/+14
| | | git-svn-id: https://svn.musicpd.org/mpd/trunk@2348 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* 1) bumb version to 0.11.3Warren Dukes2004-07-181-62/+135
| | | | | | 2) Update changelog for 0.11.3 3) Merge avuton's mpdconf.example changes git-svn-id: https://svn.musicpd.org/mpd/trunk@1875 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* Update doc's and Changelog for 0.11.1Warren Dukes2004-06-231-0/+8
| | | git-svn-id: https://svn.musicpd.org/mpd/trunk@1626 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* update mpd manpage and sample config file with replaygain andWarren Dukes2004-06-121-1/+3
| | | | | audio_output_format options git-svn-id: https://svn.musicpd.org/mpd/trunk@1453 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* change default port to 6600 (just a doc change)Warren Dukes2004-06-021-1/+1
| | | git-svn-id: https://svn.musicpd.org/mpd/trunk@1291 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* make default max playlist length be 16384. bumped up from 4096Warren Dukes2004-04-041-1/+1
| | | git-svn-id: https://svn.musicpd.org/mpd/trunk@602 09075e82-0dd4-0310-85a5-a0d7c8717e4f
* git-svn-id: https://svn.musicpd.org/mpd/trunk@441 ↵Warren Dukes2004-03-241-3/+3
| | | | 09075e82-0dd4-0310-85a5-a0d7c8717e4f