← Back to branch summary

~ubuntu-branches/ubuntu/trusty/mpd/trusty

~ubuntu-branches/ubuntu/trusty/mpd/trusty

« back to all changes in this revision

Viewing changes to doc/mpd.conf.5

Committer: Bazaar Package Importer
Author(s): Angel Abad
Date: 2011-02-02 12:26:30 UTC
mfrom: (1.5.11 upstream)
Revision ID: james.westby@ubuntu.com-20110202122630-bdyx8w4k94doz4fs

Tags: 0.16.1-1ubuntu1

* Merge from debian unstable. Remaining changes:
  - debian/control:
    + Don't build-depend on libmikmod2-dev (Debian bug #510675).
    + Move avahi-daemon from Suggests field to Recommends field.
  - debian/mpd.init.d:
    + Read mpd user from mpd.conf.
  - debian/control, debian/rules:
    + Add libmp3lame-dev to the build dependencies and enable lame.

files added:
m4/libwrap.m4

m4/pretty_print.m4

src/AudioCompress

src/AudioCompress/compress.c

src/AudioCompress/compress.h

src/AudioCompress/config.h

src/ape.c

src/ape.h

src/archive/bz2_archive_plugin.c

src/archive/bz2_archive_plugin.h

src/archive/iso9660_archive_plugin.c

src/archive/iso9660_archive_plugin.h

src/archive/zzip_archive_plugin.c

src/archive/zzip_archive_plugin.h

src/archive_plugin.c

src/archive_plugin.h

src/audio_check.c

src/audio_check.h

src/audio_format.c

src/check.h

src/client_event.c

src/client_expire.c

src/client_global.c

src/client_idle.c

src/client_internal.h

src/client_list.c

src/client_new.c

src/client_process.c

src/client_read.c

src/client_write.c

src/decoder/audiofile_decoder_plugin.c

src/decoder/faad_decoder_plugin.c

src/decoder/ffmpeg_decoder_plugin.c

src/decoder/flac_compat.h

src/decoder/flac_decoder_plugin.c

src/decoder/flac_metadata.c

src/decoder/flac_metadata.h

src/decoder/flac_pcm.c

src/decoder/flac_pcm.h

src/decoder/fluidsynth_decoder_plugin.c

src/decoder/gme_decoder_plugin.c

src/decoder/mad_decoder_plugin.c

src/decoder/mikmod_decoder_plugin.c

src/decoder/modplug_decoder_plugin.c

src/decoder/mp4ff_decoder_plugin.c

src/decoder/mpcdec_decoder_plugin.c

src/decoder/mpg123_decoder_plugin.c

src/decoder/oggflac_decoder_plugin.c

src/decoder/sidplay_decoder_plugin.cxx

src/decoder/sndfile_decoder_plugin.c

src/decoder/vorbis_decoder_plugin.c

src/decoder/wavpack_decoder_plugin.c

src/decoder/wildmidi_decoder_plugin.c

src/decoder_plugin.c

src/decoder_print.c

src/decoder_print.h

src/encoder/flac_encoder.c

src/encoder/null_encoder.c

src/encoder/twolame_encoder.c

src/encoder/wave_encoder.c

src/exclude.c

src/exclude.h

src/fd_util.c

src/fd_util.h

src/filter

src/filter/autoconvert_filter_plugin.c

src/filter/autoconvert_filter_plugin.h

src/filter/chain_filter_plugin.c

src/filter/chain_filter_plugin.h

src/filter/convert_filter_plugin.c

src/filter/convert_filter_plugin.h

src/filter/normalize_filter_plugin.c

src/filter/null_filter_plugin.c

src/filter/replay_gain_filter_plugin.c

src/filter/replay_gain_filter_plugin.h

src/filter/route_filter_plugin.c

src/filter/volume_filter_plugin.c

src/filter/volume_filter_plugin.h

src/filter_config.c

src/filter_config.h

src/filter_internal.h

src/filter_plugin.c

src/filter_plugin.h

src/filter_registry.c

src/filter_registry.h

src/glib_compat.h

src/inotify_queue.c

src/inotify_queue.h

src/inotify_source.c

src/inotify_source.h

src/inotify_update.c

src/inotify_update.h

src/input/ffmpeg_input_plugin.c

src/input/ffmpeg_input_plugin.h

src/input_init.c

src/input_init.h

src/input_registry.c

src/input_registry.h

src/main_win32.c

src/mixer/alsa_mixer_plugin.c

src/mixer/oss_mixer_plugin.c

src/mixer/pulse_mixer_plugin.c

src/mixer/pulse_mixer_plugin.h

src/mixer/software_mixer_plugin.c

src/mixer/software_mixer_plugin.h

src/mixer/winmm_mixer_plugin.c

src/mixer_type.c

src/mixer_type.h

src/mpd_error.h

src/open.h

src/output/ffado_output_plugin.c

src/output/fifo_output_plugin.c

src/output/jack_output_plugin.c

src/output/openal_plugin.c

src/output/pulse_output_plugin.c

src/output/pulse_output_plugin.h

src/output/recorder_output_plugin.c

src/output/winmm_output_plugin.c

src/output/winmm_output_plugin.h

src/pcm_byteswap.c

src/pcm_byteswap.h

src/pcm_pack.c

src/pcm_pack.h

src/playlist

src/playlist/asx_playlist_plugin.c

src/playlist/asx_playlist_plugin.h

src/playlist/cue_playlist_plugin.c

src/playlist/cue_playlist_plugin.h

src/playlist/extm3u_playlist_plugin.c

src/playlist/extm3u_playlist_plugin.h

src/playlist/flac_playlist_plugin.c

src/playlist/flac_playlist_plugin.h

src/playlist/lastfm_playlist_plugin.c

src/playlist/lastfm_playlist_plugin.h

src/playlist/m3u_playlist_plugin.c

src/playlist/m3u_playlist_plugin.h

src/playlist/pls_playlist_plugin.c

src/playlist/pls_playlist_plugin.h

src/playlist/rss_playlist_plugin.c

src/playlist/rss_playlist_plugin.h

src/playlist/xspf_playlist_plugin.c

src/playlist/xspf_playlist_plugin.h

src/playlist_any.c

src/playlist_any.h

src/playlist_database.c

src/playlist_database.h

src/playlist_list.c

src/playlist_list.h

src/playlist_mapper.c

src/playlist_mapper.h

src/playlist_plugin.h

src/playlist_queue.c

src/playlist_queue.h

src/playlist_song.c

src/playlist_song.h

src/playlist_vector.c

src/playlist_vector.h

src/refcount.h

src/replay_gain_ape.c

src/replay_gain_ape.h

src/replay_gain_config.c

src/replay_gain_config.h

src/replay_gain_info.c

src/replay_gain_info.h

src/server_socket.c

src/server_socket.h

src/song_update.c

src/tag_rva2.c

src/tag_rva2.h

src/text_file.c

src/text_file.h

src/text_input_stream.c

src/text_input_stream.h

src/tokenizer.c

src/tokenizer.h

src/update_internal.h

src/update_queue.c

src/update_remove.c

src/update_walk.c

test/dump_playlist.c

test/run_convert.c

test/run_filter.c

test/run_inotify.c

test/run_normalize.c

files removed:
doc/sticker.xml

m4/lame.m4

m4/libOggFLAC.m4

src/archive/bz2_plugin.c

src/archive/iso_plugin.c

src/archive/zip_plugin.c

src/buffer2array.c

src/buffer2array.h

src/compress.c

src/compress.h

src/decoder/audiofile_plugin.c

src/decoder/faad_plugin.c

src/decoder/ffmpeg_plugin.c

src/decoder/flac_plugin.c

src/decoder/fluidsynth_plugin.c

src/decoder/mad_plugin.c

src/decoder/mikmod_plugin.c

src/decoder/modplug_plugin.c

src/decoder/mp4ff_plugin.c

src/decoder/mpcdec_plugin.c

src/decoder/oggflac_plugin.c

src/decoder/sidplay_plugin.cxx

src/decoder/vorbis_plugin.c

src/decoder/wavpack_plugin.c

src/decoder/wildmidi_plugin.c

src/input/lastfm_input_plugin.c

src/input/lastfm_input_plugin.h

src/mixer/alsa_mixer.c

src/mixer/oss_mixer.c

src/mixer/pulse_mixer.c

src/normalize.c

src/normalize.h

src/output/fifo_plugin.c

src/output/jack_plugin.c

src/output/pulse_plugin.c

src/replay_gain.c

src/replay_gain.h

files modified:
AUTHORS

INSTALL

Makefile.am

Makefile.in

NEWS

aclocal.m4

autogen.sh

config.h.in

configure

configure.ac

debian/changelog

debian/control

depcomp

doc/doxygen.conf

doc/mpd.1

doc/mpd.conf.5

doc/mpdconf.example

doc/protocol.xml

doc/user.xml

m4/faad.m4

m4/mpd_check_cflag.m4

missing

scripts/test.sh

src/ack.h

src/aiff.c

src/aiff.h

src/archive_api.c

src/archive_api.h

src/archive_internal.h

src/archive_list.c

src/archive_list.h

src/audio.c

src/audio.h

src/audio_format.h

src/audio_parser.c

src/audio_parser.h

src/buffer.c

src/buffer.h

src/chunk.c

src/chunk.h

src/client.c

src/client.h

src/cmdline.c

src/cmdline.h

src/command.c

src/command.h

src/conf.c

src/conf.h

src/crossfade.c

src/crossfade.h

src/cue/cue_tag.c

src/cue/cue_tag.h

src/daemon.c

src/daemon.h

src/database.c

src/database.h

src/dbUtils.c

src/dbUtils.h

src/decoder/_flac_common.c

src/decoder/_flac_common.h

src/decoder/_ogg_common.c

src/decoder/_ogg_common.h

src/decoder_api.c

src/decoder_api.h

src/decoder_buffer.c

src/decoder_buffer.h

src/decoder_command.h

src/decoder_control.c

src/decoder_control.h

src/decoder_internal.c

src/decoder_internal.h

src/decoder_list.c

src/decoder_list.h

src/decoder_plugin.h

src/decoder_thread.c

src/decoder_thread.h

src/directory.c

src/directory.h

src/directory_print.c

src/directory_print.h

src/directory_save.c

src/directory_save.h

src/dirvec.c

src/dirvec.h

src/encoder/lame_encoder.c

src/encoder/vorbis_encoder.c

src/encoder_api.h

src/encoder_list.c

src/encoder_list.h

src/encoder_plugin.h

src/event_pipe.c

src/event_pipe.h

src/fifo_buffer.c

src/fifo_buffer.h

src/gcc.h

src/icy_metadata.c

src/icy_metadata.h

src/icy_server.c

src/icy_server.h

src/idle.c

src/idle.h

src/input/archive_input_plugin.c

src/input/archive_input_plugin.h

src/input/curl_input_plugin.c

src/input/curl_input_plugin.h

src/input/file_input_plugin.c

src/input/file_input_plugin.h

src/input/mms_input_plugin.c

src/input/mms_input_plugin.h

src/input/rewind_input_plugin.c

src/input/rewind_input_plugin.h

src/input_plugin.h

src/input_stream.c

src/input_stream.h

src/listen.c

src/listen.h

src/locate.c

src/locate.h

src/log.c

src/log.h

src/ls.c

src/ls.h

src/main.c

src/main.h

src/mapper.c

src/mapper.h

src/mixer_all.c

src/mixer_all.h

src/mixer_api.c

src/mixer_api.h

src/mixer_control.c

src/mixer_control.h

src/mixer_list.h

src/mixer_plugin.h

src/notify.c

src/notify.h

src/output/alsa_plugin.c

src/output/ao_plugin.c

src/output/httpd_client.c

src/output/httpd_client.h

src/output/httpd_internal.h

src/output/httpd_output_plugin.c

src/output/mvp_plugin.c

src/output/null_plugin.c

src/output/oss_plugin.c

src/output/osx_plugin.c

src/output/pipe_output_plugin.c

src/output/shout_plugin.c

src/output/solaris_output_plugin.c

src/output_all.c

src/output_all.h

src/output_api.h

src/output_command.c

src/output_command.h

src/output_control.c

src/output_control.h

src/output_init.c

src/output_internal.h

src/output_list.c

src/output_list.h

src/output_plugin.h

src/output_print.c

src/output_print.h

src/output_state.c

src/output_state.h

src/output_thread.c

src/output_thread.h

src/page.c

src/page.h

src/path.c

src/path.h

src/pcm_buffer.h

src/pcm_channels.c

src/pcm_channels.h

src/pcm_convert.c

src/pcm_convert.h

src/pcm_dither.c

src/pcm_dither.h

src/pcm_format.c

src/pcm_format.h

src/pcm_mix.c

src/pcm_mix.h

src/pcm_prng.h

src/pcm_resample.c

src/pcm_resample.h

src/pcm_resample_fallback.c

src/pcm_resample_internal.h

src/pcm_resample_libsamplerate.c

src/pcm_utils.h

src/pcm_volume.c

src/pcm_volume.h

src/permission.c

src/permission.h

src/pipe.c

src/pipe.h

src/player_control.c

src/player_control.h

src/player_thread.c

src/player_thread.h

src/playlist.c

src/playlist.h

src/playlist_control.c

src/playlist_edit.c

src/playlist_global.c

src/playlist_internal.h

src/playlist_print.c

src/playlist_print.h

src/playlist_save.c

src/playlist_save.h

src/playlist_state.c

src/playlist_state.h

src/poison.h

src/queue.c

src/queue.h

src/queue_print.c

src/queue_print.h

src/queue_save.c

src/queue_save.h

src/riff.c

src/riff.h

src/sig_handlers.c

src/sig_handlers.h

src/socket_util.c

src/socket_util.h

src/song.c

src/song.h

src/song_print.c

src/song_print.h

src/song_save.c

src/song_save.h

src/song_sticker.c

src/song_sticker.h

src/songvec.c

src/songvec.h

src/state_file.c

src/state_file.h

src/stats.c

src/stats.h

src/sticker.c

src/sticker.h

src/sticker_print.c

src/sticker_print.h

src/stored_playlist.c

src/stored_playlist.h

src/strset.c

src/strset.h

src/tag.c

src/tag.h

src/tag_ape.c

src/tag_ape.h

src/tag_id3.c

src/tag_id3.h

src/tag_internal.h

src/tag_pool.c

src/tag_pool.h

src/tag_print.c

src/tag_print.h

src/tag_save.c

src/tag_save.h

src/timer.c

src/timer.h

src/update.c

src/update.h

src/uri.c

src/uri.h

src/utils.c

src/utils.h

src/volume.c

src/volume.h

src/zeroconf-avahi.c

src/zeroconf-bonjour.c

src/zeroconf-internal.h

src/zeroconf.c

src/zeroconf.h

test/read_conf.c

test/read_mixer.c

test/read_tags.c

test/run_decoder.c

test/run_encoder.c

test/run_input.c

test/run_output.c

test/software_volume.c

Show diffs side-by-side

added added

removed removed

129

129

their own audio format which will be used for actual output to the audio

130

130

device. An example is "44100:16:2" for 44100Hz, 16 bits, and 2 channels. The

131

131

default is to use the audio format of the input file.

132

Any of the three attributes may be an asterisk to specify that this

133

attribute should not be enforced

132

134

.TP

133

135

.B samplerate_converter <integer or prefix>

134

136

This specifies the libsamplerate converter to use. The supplied value should

168

170

For an up-to-date list of available converters, please see the libsamplerate

169

171

documentation (available online at <\fBhttp://www.mega-nerd.com/SRC/\fP>).

170

172

.TP

171

.B mixer_type <alsa, oss, software, hardware or disabled>

172

This specifies which mixer to use. The default is hardware and depends on

173

what audio output support mpd was built with. Options alsa and oss are

174

legacy and should not be used in new configs, but when set mixer_device

175

and mixer_control will apply.

176

.TP

177

.B mixer_device <mixer dev>

178

This specifies which mixer to use. The default for oss is

179

"/dev/mixer"; the default for alsa is "default". This global option is

180

deprecated and should not be used. Look at the mixer_device option of

181

corresponding output device instead.

182

.TP

183

.B mixer_control <mixer ctrl>

184

This specifies which mixer control to use (sometimes referred to as

185

the "device"). Examples of mixer controls are PCM, Line1, Master,

186

etc. An example for OSS is "Pcm", and an example for alsa is

187

"PCM". This global option is deprecated and should not be used. Look

188

at the mixer_control option of corresponding output device instead.

189

.TP

190

.B replaygain <album or track>

173

.B replaygain <off or album or track or auto>

191

174

If specified, mpd will adjust the volume of songs played using ReplayGain tags

192

175

(see <\fBhttp://www.replaygain.org/\fP>). Setting this to "album" will adjust

193

176

volume using the album's ReplayGain tags, while setting it to "track" will

194

adjust it using the track ReplayGain tags. Currently only FLAC, Ogg Vorbis,

195

Musepack, and MP3 (through ID3v2 ReplayGain tags, not APEv2) are supported.

177

adjust it using the track ReplayGain tags. "auto" uses the track ReplayGain

178

tags if random play is activated otherwise the album ReplayGain tags. Currently

179

only FLAC, Ogg Vorbis, Musepack, and MP3 (through ID3v2 ReplayGain tags, not

180

APEv2) are supported.

196

181

.TP

197

182

.B replaygain_preamp <-15 to 15>

198

183

This is the gain (in dB) applied to songs with ReplayGain tags.

265

250

"artist,album,title,track". The special value "none" may be used alone to

266

251

disable all metadata. The default is to use all known tag types except for

267

252

comments.

253

.TP

254

.B auto_update <yes or no>

255

This specifies the wheter to support automatic update of music database when

256

files are changed in music_directory. The default is to disable autoupdate

257

of database.

258

.TP

259

.B auto_update_depth <N>

260

Limit the depth of the directories being watched, 0 means only watch

261

the music directory itself. There is no limit by default.

268

262

.SH REQUIRED AUDIO OUTPUT PARAMETERS

269

263

.TP

270

264

.B type <type>

280

274

audio that is sent to the audio output device. See documentation for the

281

275

\fBaudio_output_format\fP parameter for more details. The default is to use

282

276

whatever audio format is passed to the audio output.

277

Any of the three attributes may be an asterisk to specify that this

278

attribute should not be enforced

279

.TP

280

.B replay_gain_handler <software, mixer or none>

281

Specifies how replay gain is applied. The default is "software",

282

which uses an internal software volume control. "mixer" uses the

283

configured (hardware) mixer control. "none" disables replay gain on

284

this audio output.

283

285

.SH OPTIONAL ALSA OUTPUT PARAMETERS

284

286

.TP

285

287

.B device <dev>

286

288

This specifies the device to use for audio output. The default is "default".

287

289

.TP

290

.B mixer_type <hardware, software or none>

291

Specifies which mixer should be used for this audio output: the

292

hardware mixer (available for ALSA, OSS and PulseAudio), the software

293

mixer or no mixer ("none"). By default, the hardware mixer is used

294

for devices which support it, and none for the others.

295

.TP

288

296

.B mixer_device <mixer dev>

289

297

This specifies which mixer to use. The default is "default". To use

290

298

the second sound card in a system, use "hw:1".

352

360

.TP

353

361

.B sink <sink>

354

362

The sink to output to. The default is to let PulseAudio choose a sink.

355

.SH REQUIRED JACK OUTPUT PARAMETERS

363

.SH OPTIONAL JACK OUTPUT PARAMETERS

356

364

.TP

357

.B name <name>

365

.B client_name <name>

358

366

The client name to use when connecting to JACK. The output ports <name>:left

359

367

and <name>:right will also be created for the left and right channels,

360

368

respectively.

361

.SH OPTIONAL JACK OUTPUT PARAMETERS

362

369

.TP

363

370

.B ports <left_port,right_port>

364

371

This specifies the left and right ports to connect to for the left and right

Older »