aboutsummaryrefslogtreecommitdiffstats
path: root/doc/mpdconf.example (follow)
Commit message (Collapse)AuthorAgeFilesLines
* output: use the software mixer pluginMax Kellermann2009-07-061-27/+4
| | | | | | | | | | Do all the software volume stuff inside each output thread, not in the player thread. This allows one software mixer per output device, and also allows the user to configure the mixer type (hardware or software) for each audio output. This moves the global "mixer_type" setting into the "audio_output" section, deprecating the "mixer_enabled" flag.
* alsa_mixer: add mixer_index optionDaniel Kahn Gillmor2009-04-281-0/+1
| | | | This allows you to select controls with duplicate names.
* curl: moved proxy settings to "input" blockMax Kellermann2009-04-251-13/+13
| | | | | The old global settings "http_proxy_host", "http_proxy_port", "http_proxy_user" and "http_proxy_password" continue to work.
* exconf: Fix spacingAvuton Olrich2009-03-301-0/+3
|
* exconf: update mixer documentation.Avuton Olrich2009-03-291-7/+12
|
* exconf: The usual defaults updates.Avuton Olrich2009-03-291-60/+65
| | | | | Ths usual defaults updates, this includes clarifications, cleanups, updates and fixes.
* exconf: Comment formerly required files.Avuton Olrich2009-03-291-4/+4
|
* exconf: Merge required files with optional.Avuton Olrich2009-03-291-5/+1
|
* httpd: correct the encoder name in the example mpd.confJeffrey Middleton2009-03-171-3/+3
| | | | It's called "vorbis", not "ogg".
* httpd: new output plugin to replace "shout"Max Kellermann2009-03-151-0/+12
| | | | | | | | | | | | | | | | | | | Let's get rid of the "shout" plugin, and the awfully complicated icecast daemon setup! MPD can do better if it's doing the HTTP server stuff on its own. This new plugin has several advantages: - easier to set up - only one daemon, no password settings, no mount settings - MPD controls the encoder and thus already knows the packet boundaries - icecast has to parse them - MPD doesn't bother to encode data while nobody is listening This implementation is very experimental (no header parsing, ignores request URI, no icy-metadata, ...). It should be able to suport several encoders in parallel in the future (with different bit rates, different codec, ...), to make MPD the perfect streaming server. Once MPD gets multi-player support, we can even mount several different radio stations on one server.
* pipe: new audio output plugin which runs a commandMichal Nazarewicz2009-02-281-0/+13
| | | | [mk: adapted to new output plugin API]
* mixer: Add "disabled" mixer_type.Avuton Olrich2009-02-261-0/+4
|
* mixer: renamed mix_* options to mixer_*Max Kellermann2009-01-011-4/+4
| | | | There is no reason to use the shortcut "mix" instead of "mixer".
* Moving mixers to audio outputsViliam Mateicka2008-12-311-10/+6
|
* log: support syslog()Max Kellermann2008-12-281-0/+4
| | | | Allow logging to syslog if log_file is configured to "syslog".
* log: deprecated "error_file" optionMax Kellermann2008-12-281-1/+0
| | | | | Removed the "error_file" option. There is only one log file now. If a user wants to see only the errors, he should configure a log_level.
* Fix a few problems with the huge mpdconf update. There's alot of shift here, ↵Avuton Olrich2008-12-241-72/+86
| | | | mostly due to word wraps. This, also, improves on uniformity and clarity of the document.
* 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