From b9b7e6392e6f55b6d532eedd4520cde4b466c1b4 Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Tue, 2 May 2017 09:35:38 -0400 Subject: Update mpd and ncmpcpp configs New copies from /usr/share/doc/{mpd,ncmpcpp} There might still be useful stuff in the previous configurations (bindings etc) --- mpd/.config/mpd/mpd.conf | 147 ++++++++++++++++------------------------------- 1 file changed, 48 insertions(+), 99 deletions(-) (limited to 'mpd/.config') diff --git a/mpd/.config/mpd/mpd.conf b/mpd/.config/mpd/mpd.conf index 9f6ecc2..b1e1e79 100644 --- a/mpd/.config/mpd/mpd.conf +++ b/mpd/.config/mpd/mpd.conf @@ -10,14 +10,14 @@ # be disabled and audio files will only be accepted over ipc socket (using # file:// protocol) or streaming files over an accepted protocol. # -music_directory "~/music" +music_directory "~/usr/music" # # This setting sets the MPD internal playlist directory. The purpose of this # directory is storage for playlists created by MPD. The server will use # playlist files not created by the server but only if they are in the MPD # format. This setting defaults to playlist saving being disabled. # -playlist_directory "~/.config/mpd/playlists" +playlist_directory "~/.mpd/playlists" # # This setting sets the location of the MPD database. This file is used to # load the database at server start up and store the database while the @@ -25,7 +25,7 @@ playlist_directory "~/.config/mpd/playlists" # MPD to accept files over ipc socket (using file:// protocol) or streaming # files over an accepted protocol. # -db_file "~/.config/mpd/database" +db_file "~/.mpd/database" # # These settings are the locations for the daemon log files for the daemon. # These logs are great for troubleshooting, depending on your log_level @@ -34,25 +34,25 @@ db_file "~/.config/mpd/database" # The special value "syslog" makes MPD use the local syslog daemon. This # setting defaults to logging to syslog, otherwise logging is disabled. # -log_file "~/.config/mpd/log" +log_file "~/.mpd/log" # # This setting sets the location of the file which stores the process ID # for use of mpd --kill and some init scripts. This setting is disabled by # default and the pid file will not be stored. # -pid_file "~/.config/mpd/pid" +pid_file "~/.mpd/pid" # # This setting sets the location of the file which contains information about # most variables to get MPD back into the same general shape it was in before # it was brought down. This setting is disabled by default and the server # state will be reset on server start up. # -state_file "~/.config/mpd/state" +state_file "~/.mpd/state" # # The location of the sticker database. This is a database which # manages dynamic information attached to songs. # -sticker_file "~/.config/mpd/sticker.sql" +sticker_file "~/.mpd/sticker.sql" # ############################################################################### @@ -75,7 +75,8 @@ sticker_file "~/.config/mpd/sticker.sql" # # This setting sets the address for the daemon to listen on. Careful attention # should be paid if this is assigned to anything other then the default, any. -# This setting can deny access to control of the daemon. +# This setting can deny access to control of the daemon. Not effective if +# systemd socket activiation is in use. # # For network #bind_to_address "any" @@ -115,7 +116,7 @@ sticker_file "~/.config/mpd/sticker.sql" # # This setting defines a list of tag types that will be extracted during the # audio file discovery process. The complete list of possible values can be -# found in the mpd.conf man page. +# found in the user manual. #metadata_to_use "artist,album,title,track,name,genre,date,composer,performer,disc" # # This setting enables automatic update of MPD's database when files in @@ -164,7 +165,7 @@ sticker_file "~/.config/mpd/sticker.sql" # Permissions ################################################################# # # If this setting is set, MPD will require password authorization. The password -# can setting can be specified multiple times for different password profiles. +# setting can be specified multiple times for different password profiles. # #password "password@read,add,control,admin" # @@ -199,6 +200,19 @@ input { # Audio Output ################################################################ # + +audio_output { + type "pulse" + name "pulse audio" +} + +audio_output { + type "fifo" + name "my_fifo" + path "/tmp/mpd.fifo" + format "44100:16:2" +} + # MPD supports various audio output types, as well as playing through multiple # audio outputs at the same time, through multiple audio_output settings # blocks. Setting this block is optional, though the server will only attempt @@ -207,27 +221,14 @@ input { # An example of an ALSA output: # #audio_output { - #type "alsa" - #name "My ALSA Device" +# type "alsa" +# name "My ALSA Device" ## device "hw:0,0" # optional -### mixer_type "hardware" # optional -### mixer_device "default" # optional -### mixer_control "PCM" # optional -### mixer_index "0" # optional +## mixer_type "hardware" # optional +## mixer_device "default" # optional +## mixer_control "PCM" # optional +## mixer_index "0" # optional #} - -audio_output { - type "pulse" - name "pulse audio" -} - -audio_output { - type "fifo" - name "my_fifo" - path "/tmp/mpd.fifo" - format "44100:16:2" - } - # # An example of an OSS output: # @@ -244,7 +245,7 @@ audio_output { # #audio_output { # type "shout" -# encoding "ogg" # optional +# encoder "vorbis" # optional # name "My Shout Stream" # host "localhost" # port "8000" @@ -317,6 +318,23 @@ audio_output { ## device "Digital Audio (S/PDIF) (High Definition Audio Device)" # optional #} # +# An example of an sndio output. +# +#audio_output { +# type "sndio" +# name "sndio output" +# mixer_type "software" +#} +# +# An example of an OS X output: +# +#audio_output { +# type "osx" +# name "My OS X Device" +## device "Built-in Output" # optional +## channel_map "-1,-1,0,1" # optional +#} +# ## Example "pipe" output: # #audio_output { @@ -338,13 +356,6 @@ audio_output { # mixer_type "none" # optional #} # -# If MPD has been compiled with libsamplerate support, this setting specifies -# the sample rate converter to use. Possible values can be found in the -# mpd.conf man page or the libsamplerate documentation. By default, this is -# setting is disabled. -# -#samplerate_converter "Fastest Sinc Interpolator" -# ############################################################################### @@ -386,38 +397,6 @@ audio_output { # ############################################################################### - -# MPD Internal Buffering ###################################################### -# -# This setting adjusts the size of internal decoded audio buffering. Changing -# this may have undesired effects. Don't change this if you don't know what you -# are doing. -# -#audio_buffer_size "4096" -# -# This setting controls the percentage of the buffer which is filled before -# beginning to play. Increasing this reduces the chance of audio file skipping, -# at the cost of increased time prior to audio playback. -# -#buffer_before_play "10%" -# -############################################################################### - - -# Resource Limitations ######################################################## -# -# These settings are various limitations to prevent MPD from using too many -# resources. Generally, these settings should be minimized to prevent security -# risks, depending on the operating resources. -# -#connection_timeout "60" -#max_connections "10" -#max_playlist_length "16384" -#max_command_list_size "2048" -#max_output_buffer_size "8192" -# -############################################################################### - # Character Encoding ########################################################## # # If file or directory names do not display correctly for your locale then you @@ -425,34 +404,4 @@ audio_output { # #filesystem_charset "UTF-8" # -# This setting controls the encoding that ID3v1 tags should be converted from. -# -#id3v1_encoding "ISO-8859-1" -# ############################################################################### - - -# SIDPlay decoder ############################################################# -# -# songlength_database: -# Location of your songlengths file, as distributed with the HVSC. -# The sidplay plugin checks this for matching MD5 fingerprints. -# See http://www.c64.org/HVSC/DOCUMENTS/Songlengths.faq -# -# default_songlength: -# This is the default playing time in seconds for songs not in the -# songlength database, or in case you're not using a database. -# A value of 0 means play indefinitely. -# -# filter: -# Turns the SID filter emulation on or off. -# -#decoder { -# plugin "sidplay" -# songlength_database "/media/C64Music/DOCUMENTS/Songlengths.txt" -# default_songlength "120" -# filter "true" -#} -# -############################################################################### - -- cgit v1.2.3-60-g2f50