63793bddbc
- Updated to 0.23.4 * Refreshed patch mpd-conf.patch. * Removed patch mpd-service.patch. * https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.4/NEWS * protocol: add optional position parameter to "searchaddpl" * decoder: ffmpeg: support libavcodec 59 * output: alsa: add option "thesycon_dsd_workaround" to work around device bug * fix crash on debug builds if startup fails * systemd: * remove "RuntimeDirectory" directive because it caused problems * ignore the "pid_file" setting if started as systemd service OBS-URL: https://build.opensuse.org/request/show/931200 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpd?expand=0&rev=83
202 lines
6.5 KiB
Diff
202 lines
6.5 KiB
Diff
diff -Pdpru mpd-0.23.4.orig/doc/mpdconf.example mpd-0.23.4/doc/mpdconf.example
|
|
--- mpd-0.23.4.orig/doc/mpdconf.example 2021-11-11 12:16:36.000000000 +0300
|
|
+++ mpd-0.23.4/doc/mpdconf.example 2021-11-13 01:39:07.843410617 +0300
|
|
@@ -17,7 +17,7 @@
|
|
# 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 "~/.mpd/playlists"
|
|
+#playlist_directory "/var/lib/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 @@
|
|
# MPD to accept files over ipc socket (using file:// protocol) or streaming
|
|
# files over an accepted protocol.
|
|
#
|
|
-#db_file "~/.mpd/database"
|
|
+#db_file "/var/lib/mpd/mpd.db"
|
|
|
|
# These settings are the locations for the daemon log files for the daemon.
|
|
#
|
|
@@ -35,7 +35,7 @@
|
|
# If you use systemd, do not configure a log_file. With systemd, MPD
|
|
# defaults to the systemd journal, which is fine.
|
|
#
|
|
-#log_file "~/.mpd/log"
|
|
+#log_file "/var/log/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
|
|
@@ -43,19 +43,19 @@
|
|
#
|
|
# If you use systemd, do not configure a pid_file.
|
|
#
|
|
-#pid_file "~/.mpd/pid"
|
|
+#pid_file "/run/mpd/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 "~/.mpd/state"
|
|
+#state_file "/var/lib/mpd/mpdstate"
|
|
#
|
|
# The location of the sticker database. This is a database which
|
|
# manages dynamic information attached to songs.
|
|
#
|
|
-#sticker_file "~/.mpd/sticker.sql"
|
|
+#sticker_file "/var/lib/mpd/sticker.sql"
|
|
#
|
|
###############################################################################
|
|
|
|
@@ -67,14 +67,14 @@
|
|
# initialization. This setting is disabled by default and MPD is run as the
|
|
# current user.
|
|
#
|
|
-#user "nobody"
|
|
+#user "mpd"
|
|
#
|
|
# This setting specifies the group that MPD will run as. If not specified
|
|
# primary group of user specified with "user" setting will be used (if set).
|
|
# This is useful if MPD needs to be a member of group such as "audio" to
|
|
# have permission to use sound card.
|
|
#
|
|
-#group "nogroup"
|
|
+#group "audio"
|
|
#
|
|
# This setting sets the address for the daemon to listen on. Careful attention
|
|
# should be paid if this is assigned to anything other than the default, any.
|
|
@@ -85,7 +85,7 @@
|
|
#bind_to_address "any"
|
|
#
|
|
# And for Unix Socket
|
|
-#bind_to_address "~/.mpd/socket"
|
|
+#bind_to_address "/run/mpd/socket"
|
|
#
|
|
# This setting is the TCP port that is desired for the daemon to get assigned
|
|
# to.
|
|
@@ -96,7 +96,7 @@
|
|
# troubleshooting. Available setting arguments are "notice", "info", "verbose",
|
|
# "warning" and "error".
|
|
#
|
|
-#log_level "notice"
|
|
+log_level "warning"
|
|
#
|
|
# Setting "restore_paused" to "yes" puts MPD into pause mode instead
|
|
# of starting playback after startup.
|
|
@@ -120,7 +120,7 @@
|
|
# This setting enables automatic update of MPD's database when files in
|
|
# music_directory are changed.
|
|
#
|
|
-#auto_update "yes"
|
|
+auto_update "no"
|
|
#
|
|
# Limit the depth of the directories being watched, 0 means only watch
|
|
# the music directory itself. There is no limit by default.
|
|
@@ -150,7 +150,7 @@
|
|
# If this setting is set to "yes", service information will be published with
|
|
# Zeroconf / Avahi.
|
|
#
|
|
-#zeroconf_enabled "yes"
|
|
+zeroconf_enabled "no"
|
|
#
|
|
# The argument to this setting will be the Zeroconf / Avahi unique name for
|
|
# this MPD server on the network. %h will be replaced with the hostname.
|
|
@@ -217,8 +217,9 @@ input {
|
|
#
|
|
#audio_output {
|
|
# type "alsa"
|
|
-# name "My ALSA Device"
|
|
-## device "hw:0,0" # optional
|
|
+# name "ALSA Device"
|
|
+## device "plug:plugequal" # optional
|
|
+## mixer_control "Master" # optional
|
|
## mixer_type "hardware" # optional
|
|
## mixer_device "default" # optional
|
|
## mixer_control "PCM" # optional
|
|
@@ -241,14 +242,14 @@ input {
|
|
#audio_output {
|
|
# type "shout"
|
|
# encoder "vorbis" # optional
|
|
-# name "My Shout Stream"
|
|
+# name "Shout Stream"
|
|
# host "localhost"
|
|
# port "8000"
|
|
# mount "/mpd.ogg"
|
|
# password "hackme"
|
|
-# quality "5.0"
|
|
-# bitrate "128"
|
|
-# format "44100:16:1"
|
|
+# quality "6.0"
|
|
+# bitrate "192"
|
|
+# format "48000:16:2"
|
|
## protocol "icecast2" # optional
|
|
## user "source" # optional
|
|
## description "My Stream Description" # optional
|
|
@@ -266,34 +267,34 @@ input {
|
|
# name "My recorder"
|
|
# encoder "vorbis" # optional, vorbis or lame
|
|
# path "/var/lib/mpd/recorder/mpd.ogg"
|
|
-## quality "5.0" # do not define if bitrate is defined
|
|
-# bitrate "128" # do not define if quality is defined
|
|
-# format "44100:16:1"
|
|
+## quality "6.0" # do not define if bitrate is defined
|
|
+# bitrate "192" # do not define if quality is defined
|
|
+# format "48000:16:2"
|
|
#}
|
|
#
|
|
# An example of a httpd output (built-in HTTP streaming server):
|
|
#
|
|
#audio_output {
|
|
# type "httpd"
|
|
-# name "My HTTP Stream"
|
|
-# encoder "vorbis" # optional, vorbis or lame
|
|
+# name "HTTP Stream"
|
|
+# encoder "vorbis" # optional, vorbis or lame
|
|
# port "8000"
|
|
# bind_to_address "0.0.0.0" # optional, IPv4 or IPv6
|
|
-## quality "5.0" # do not define if bitrate is defined
|
|
-# bitrate "128" # do not define if quality is defined
|
|
-# format "44100:16:1"
|
|
+## quality "6.0" # do not define if bitrate is defined
|
|
+# bitrate "192" # do not define if quality is defined
|
|
+# format "48000:16:2"
|
|
# max_clients "0" # optional 0=no limit
|
|
#}
|
|
#
|
|
# An example of a pulseaudio output (streaming to a remote pulseaudio server)
|
|
#
|
|
-#audio_output {
|
|
-# type "pulse"
|
|
-# name "My Pulse Output"
|
|
+audio_output {
|
|
+ type "pulse"
|
|
+ name "Pulse Output"
|
|
## server "remote_server" # optional
|
|
## sink "remote_server_sink" # optional
|
|
## media_role "media_role" #optional
|
|
-#}
|
|
+}
|
|
#
|
|
# An example of a winmm output (Windows multimedia API).
|
|
#
|
|
@@ -355,7 +356,7 @@ input {
|
|
# command "AudioCompress -m | aplay -f cd 2>/dev/null"
|
|
## Or to send raw PCM stream through PCM:
|
|
# command "nc example.org 8765"
|
|
-# format "44100:16:2"
|
|
+# format "48000:16:2"
|
|
#}
|
|
#
|
|
## An example of a null output (for no audio output):
|
|
@@ -413,6 +414,6 @@ input {
|
|
# If file or directory names do not display correctly for your locale then you
|
|
# may need to modify this setting.
|
|
#
|
|
-#filesystem_charset "UTF-8"
|
|
+filesystem_charset "UTF-8"
|
|
#
|
|
###############################################################################
|