hannes/dotfiles
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/whatevsz/dotfiles

Browse Source 
Conflicts:
	mpd/mpd/mpd.conf
This commit is contained in:
Hannes Körber
2014-04-26 02:35:54 +02:00
parent 6a2fad299c 187df11248
commit 0eff2cfae0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mpd/mpd/mpd.conf
View File

@@ -47,7 +47,7 @@ pid_file "~/.var/run/mpd.pid"
# it was brought down. This setting is disabled by default and the server # it was brought down. This setting is disabled by default and the server
# state will be reset on server start up. # state will be reset on server start up.
# #
#state_file "~/.mpd/state" state_file "~/.var/local/mpd.state"
# #
# The location of the sticker database. This is a database which # The location of the sticker database. This is a database which
# manages dynamic information attached to songs. # manages dynamic information attached to songs.
@@ -78,7 +78,7 @@ pid_file "~/.var/run/mpd.pid"
# This setting can deny access to control of the daemon. # This setting can deny access to control of the daemon.
# #
# For network # For network
#bind_to_address "any" bind_to_address "any"
# #
# And for Unix Socket # And for Unix Socket
#bind_to_address "~/.mpd/socket" #bind_to_address "~/.mpd/socket"
@@ -106,7 +106,7 @@ gapless_mp3_playback "yes"
# Setting "restore_paused" to "yes" puts MPD into pause mode instead # Setting "restore_paused" to "yes" puts MPD into pause mode instead
# of starting playback after startup. # of starting playback after startup.
# #
restore_paused "no" restore_paused "yes"
# #
# This setting enables MPD to create playlists in a format usable by other # This setting enables MPD to create playlists in a format usable by other
# music players. # music players.
@@ -363,7 +363,7 @@ replaygain "auto"
# above its original level. If replaygain_limit is disabled such amplification # above its original level. If replaygain_limit is disabled such amplification
# might occur. By default this setting is enabled. # might occur. By default this setting is enabled.
# #
#replaygain_limit "yes" replaygain_limit "yes"
# #
# This setting enables on-the-fly normalization volume adjustment. This will # This setting enables on-the-fly normalization volume adjustment. This will
# result in the volume of all playing audio to be adjusted so the output has # result in the volume of all playing audio to be adjusted so the output has