config

commit cd925d675ce845d6747cfcc6b98210ffe4130c3d
parent 328a5735ea65868e9d13dee37a4d6f7115365cc7
Author: Jacob R. Edwards <jacobouno@protonmail.com>
Date:   Thu, 30 Jul 2020 00:20:53 -0700

Remove icecast config and reconfigure mpd

Diffstat:
D
mpd/.config/mpd/config-icecast
 | 
140
-------------------------------------------------------------------------------
M
mpd/.config/mpd/mpd.conf
 | 
35
+++++++++++++----------------------

2 files changed, 13 insertions(+), 162 deletions(-)
diff --git a/mpd/.config/mpd/config-icecast b/mpd/.config/mpd/config-icecast
@@ -1,140 +0,0 @@
-# MPD conf. 
-
-music_directory		"~/media/audio/"
-playlist_directory	"~/.mpd/playlists"
-log_file			"~/.mpd/icelog"
-pid_file			"~/.mpd/icepid"
-state_file			"~/.mpd/icestate"
-sticker_file		"~/.mpd/sticker.sql"
-
-
-audio_output {
-        type            "pulse"
-        name            "pulse audio"
-}
-
-audio_output {
-    type                    "fifo"
-    name                    "my_fifo"
-    path                    "/tmp/mpd.fifo"
-    format                  "44100:16:2"
-}
-
-
-
-user				"jacob"
-group				"jacob"
-bind_to_address		"127.0.0.1"
-bind_to_address		"~/.mpd/socket"
-port				"6600"
-
-
-log_level			"default"
-restore_paused "no"
-
-save_absolute_paths_in_playlists	"no"
-
-metadata_to_use	"artist,album,title,track,name,genre,date,composer,performer,disc"
-metadata_to_use "+comment"
-
-auto_update	"no"
-auto_update_depth "3"
-
-follow_outside_symlinks	"yes"
-follow_inside_symlinks	"yes"
-zeroconf_enabled		"yes"
-#zeroconf_name			"Music Player @ %h"
-
-
-#password                        "password@read,add,control,admin"
-#default_permissions             "read,add,control,admin"
-
-
-database {
-       plugin "proxy"
-       host "localhost"
-       port "6600"
-}
-
-
-input {
-        plugin "curl"
-#       proxy "proxy.isp.com:8080"
-#       proxy_user "user"
-#       proxy_password "password"
-}
-
-
-audio_output {
-	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
-}
-
-
-# An example of a shout output (for streaming to Icecast):
-#audio_output {
-#	type		"shout"
-#   encoder		"vorbis"		# optional
-#	name		"My Shout Stream"
-#	host		"localhost"
-#	port		"8000"
-#	mount		"/mpd.ogg"
-#	password	"hackme"
-#	quality		"5.0"
-#	bitrate		"128"
-#	format		"44100:16:1"
-##	protocol	"icecast2"		# optional
-##	user		"source"		# optional
-##	description	"My Stream Description"	# optional
-##	url		"http://example.com"	# optional
-##	genre		"jazz"			# optional
-##	public		"no"			# optional
-##	timeout		"2"			# optional
-##	mixer_type      "software"		# optional
-#}
-
-
-
-# An example of a pulseaudio output (streaming to a remote pulseaudio server)
-#audio_output {
-#	type		"pulse"
-#	name		"My Pulse Output"
-##	server		"remote_server"		# optional
-##	sink		"remote_server_sink"	# optional
-#}
-#
-
-
-
-replaygain			"album"
-replaygain_preamp		"0"
-replaygain_missing_preamp	"0"
-replaygain_limit		"yes"
-volume_normalization		"no"
-
-filesystem_charset		"UTF-8"
-
-input {
-        enabled    "no"
-        plugin     "qobuz"
-#        app_id     "ID"
-#        app_secret "SECRET"
-#        username   "USERNAME"
-#        password   "PASSWORD"
-#        format_id  "N"
-}
-
-# TIDAL input plugin
-input {
-        enabled      "no"
-        plugin       "tidal"
-#        token        "TOKEN"
-#        username     "USERNAME"
-#        password     "PASSWORD"
-#        audioquality "Q"
-}
diff --git a/mpd/.config/mpd/mpd.conf b/mpd/.config/mpd/mpd.conf
@@ -1,48 +1,39 @@
-# MPD configuration
+# mpd configuration
 
 # files and directories
-music_directory "~/audio"
-playlist_directory "~/audio/playlists"
 bind_to_address "~/.local/var/mpd/socket"
 db_file "~/.local/var/mpd/database"
+log_file "~/.local/var/mpd/log"
+music_directory "~/audio"
 pid_file "~/.local/var/mpd/pid"
+playlist_directory "~/audio/playlists"
 state_file "~/.local/var/mpd/state"
 sticker_file "~/.local/var/mpd/sticker.sql"
 
-# logging
-log_level "secure"
-log_file "~/.local/var/mpd/log"
-
 # security/permisions
 user "jacob"
 default_permissions "read,add,control"
 
+# logging
+log_level "default"
+
 # networking
 port "6600"
-bind_to_address "any"
+bind_to_address "localhost"
 
 # filesystem
 follow_outside_symlinks "yes"
 follow_inside_symlinks "yes"
 save_absolute_paths_in_playlists "no"
 
-# other settings
+# general settings
 zeroconf_enabled "no"
-metadata_to_use "artist,album,title,track,name,genre,date,composer,performer,disc"
 restore_paused "no"
 auto_update "no"
-
-# output settings
 volume_normalization "yes"
 
 # sndio output
-#audio_output {
-#    type "sndio"
-#    name "mpd sndio"
-#}
-
-# pulseaudio output
-#audio_output {
-#    type "alsa"
-#    name "mpd alsa"
-#}
+audio_output {
+    type "sndio"
+    name "mpd sndio"
+}