aboutsummaryrefslogtreecommitdiffstats
path: root/doc/mpdconf.example (unfollow)
Commit message (Collapse)AuthorFilesLines
2008-09-12shout: introduce pluggable encoder APIEric Wollesen1-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]
2007-06-12Make the shout timeout configurable. The default is still 2 seconds.J. Alexander Treuman1-0/+1
git-svn-id: https://svn.musicpd.org/mpd/trunk@6556 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2007-06-03Adding ChangeLog entry for zeroconf_enabled, adding Zeroconf section toJ. Alexander Treuman1-4/+8
mpdconf.example, and updating the zeroconf_* docs. git-svn-id: https://svn.musicpd.org/mpd/trunk@6474 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2007-06-03allow zeroconf to be disabled.Patrik Weiskircher1-0/+4
git-svn-id: https://svn.musicpd.org/mpd/trunk@6467 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2007-05-30Adding a null output to mpdconf.example.J. Alexander Treuman1-0/+7
git-svn-id: https://svn.musicpd.org/mpd/trunk@6394 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2007-05-27Increasing default buffer_before_play from 0% to 10%.J. Alexander Treuman1-1/+1
git-svn-id: https://svn.musicpd.org/mpd/trunk@6290 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2007-05-23Adding a note to mpdconf.example about increasing buffer_before_play if youJ. Alexander Treuman1-0/+1
hear skipping when changing songs. git-svn-id: https://svn.musicpd.org/mpd/trunk@6240 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2007-03-31Updating metadata_to_use docs to be more consistent with tagtypes command.J. Alexander Treuman1-1/+2
git-svn-id: https://svn.musicpd.org/mpd/trunk@5793 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2007-02-13Tidying up libsamplerate example in mpdconf.example.J. Alexander Treuman1-4/+5
git-svn-id: https://svn.musicpd.org/mpd/trunk@5333 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2007-02-02Add libsamplerate support, old resampling is still an option, but this ↵Avuton Olrich1-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
2007-01-11Added zeroconf service publishing using avahiJim Ramsay1-0/+6
git-svn-id: https://svn.musicpd.org/mpd/trunk@5238 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-12-23Adding documentation for gapless_mp3_playback config option.J. Alexander Treuman1-2/+10
git-svn-id: https://svn.musicpd.org/mpd/trunk@5158 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-09-15Filling in link to wiki for audio outputs in mpdconf.exampleJ. Alexander Treuman1-2/+2
git-svn-id: https://svn.musicpd.org/mpd/trunk@4776 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-09-13I can't believe qball is correcting my typos.J. Alexander Treuman1-1/+1
git-svn-id: https://svn.musicpd.org/mpd/trunk@4771 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-09-12Typo found by bensonk.J. Alexander Treuman1-1/+1
git-svn-id: https://svn.musicpd.org/mpd/trunk@4769 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-09-12New example config.J. Alexander Treuman1-171/+173
git-svn-id: https://svn.musicpd.org/mpd/trunk@4768 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-07-22Adding on the fly volume normalization support. Code originally from ↵J. Alexander Treuman1-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
2006-07-16Fix more shank typos in mpdconf.example. Thanks to ves for reporting them.J. Alexander Treuman1-2/+2
git-svn-id: https://svn.musicpd.org/mpd/trunk@4358 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-06-30Typo.J. Alexander Treuman1-1/+1
git-svn-id: https://svn.musicpd.org/mpd/trunk@4293 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-06-21Add back the id3v1_encoding option. Now it really will convert id3v1 only.J. Alexander Treuman1-0/+4
git-svn-id: https://svn.musicpd.org/mpd/trunk@4282 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2006-01-14fix title->track in config file replaygain exampleQball Cow1-1/+1
git-svn-id: https://svn.musicpd.org/mpd/trunk@3827 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-07-31remove unnecessary apostropheEric Wong1-1/+1
git-svn-id: https://svn.musicpd.org/mpd/trunk@3410 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-04-27change the default max_output_buffer_size from 2048 to 8192Warren Dukes1-1/+1
git-svn-id: https://svn.musicpd.org/mpd/trunk@3226 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-12update config fileWarren Dukes1-9/+10
git-svn-id: https://svn.musicpd.org/mpd/trunk@3060 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-09*) add support for pid filesWarren Dukes1-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
2005-03-06config file change! now 'port' is optional and 'db_file' is required!Warren Dukes1-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
2005-03-06sample config file exampleWarren Dukes1-0/+3
git-svn-id: https://svn.musicpd.org/mpd/trunk@3026 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2005-03-05added composer, performer, and comment metadata itemsWarren Dukes1-7/+6
git-svn-id: https://svn.musicpd.org/mpd/trunk@3022 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-11-10merge changes from metadata-rewrite branchWarren Dukes1-0/+4
git-svn-id: https://svn.musicpd.org/mpd/trunk@2589 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-11-09add "genre" and "description" to shout config parametersWarren Dukes1-1/+5
git-svn-id: https://svn.musicpd.org/mpd/trunk@2557 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-11-06update mpdconf.exampleWarren Dukes1-1/+3
git-svn-id: https://svn.musicpd.org/mpd/trunk@2527 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-10-29update default mpdconf.example to use default ao outputWarren Dukes1-59/+61
git-svn-id: https://svn.musicpd.org/mpd/trunk@2407 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-10-28merge shank-rewrite-config changesWarren Dukes1-35/+31
git-svn-id: https://svn.musicpd.org/mpd/trunk@2375 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-10-26Added ao_driver options to help the user pick what they need, also told to ↵Avuton Olrich1-0/+16
refer to libao docs for more info git-svn-id: https://svn.musicpd.org/mpd/trunk@2350 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-10-26add shout* stuff to exampe mpd config fileWarren Dukes1-0/+14
git-svn-id: https://svn.musicpd.org/mpd/trunk@2348 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-07-181) bumb version to 0.11.3Warren Dukes1-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
2004-06-23Update doc's and Changelog for 0.11.1Warren Dukes1-0/+8
git-svn-id: https://svn.musicpd.org/mpd/trunk@1626 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-06-12update mpd manpage and sample config file with replaygain andWarren Dukes1-1/+3
audio_output_format options git-svn-id: https://svn.musicpd.org/mpd/trunk@1453 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-06-02change default port to 6600 (just a doc change)Warren Dukes1-1/+1
git-svn-id: https://svn.musicpd.org/mpd/trunk@1291 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-04-04make default max playlist length be 16384. bumped up from 4096Warren Dukes1-1/+1
git-svn-id: https://svn.musicpd.org/mpd/trunk@602 09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-03-24git-svn-id: https://svn.musicpd.org/mpd/trunk@441 ↵Warren Dukes1-3/+3
09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-03-24git-svn-id: https://svn.musicpd.org/mpd/trunk@440 ↵Warren Dukes1-3/+3
09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-03-24git-svn-id: https://svn.musicpd.org/mpd/trunk@439 ↵Warren Dukes1-5/+5
09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-03-24git-svn-id: https://svn.musicpd.org/mpd/trunk@437 ↵Warren Dukes1-1/+1
09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-03-24git-svn-id: https://svn.musicpd.org/mpd/trunk@435 ↵Warren Dukes1-1/+1
09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-03-24git-svn-id: https://svn.musicpd.org/mpd/trunk@434 ↵Warren Dukes1-4/+4
09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-03-24git-svn-id: https://svn.musicpd.org/mpd/trunk@433 ↵Warren Dukes1-0/+3
09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-03-24git-svn-id: https://svn.musicpd.org/mpd/trunk@432 ↵Warren Dukes1-0/+5
09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-03-24git-svn-id: https://svn.musicpd.org/mpd/trunk@431 ↵Warren Dukes1-3/+2
09075e82-0dd4-0310-85a5-a0d7c8717e4f
2004-03-24update with better documentationWarren Dukes1-23/+88
git-svn-id: https://svn.musicpd.org/mpd/trunk@430 09075e82-0dd4-0310-85a5-a0d7c8717e4f