[termux-packages] / packages / mpd / mpdconf.example.patch

--- ./doc/mpdconf.example	2017-07-18 12:54:14.570036043 +0200
+++ ./doc/mpdconf.example	2017-07-18 12:56:34.270035990 +0200
@@ -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	"/sdcard/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		"~/.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 @@
 # MPD to accept files over ipc socket (using file:// protocol) or streaming
 # files over an accepted protocol.
 #
-#db_file			"~/.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 @@
 # The special value "syslog" makes MPD use the local syslog daemon. This
 # setting defaults to logging to syslog, otherwise logging is disabled.
 #
-#log_file			"~/.mpd/log"
+#log_file			"@TERMUX_HOME@/.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			"~/.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			"~/.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			"~/.mpd/sticker.sql"
+sticker_file			"~/.mpd/sticker.sql"
 #
 ###############################################################################
 
@@ -77,17 +77,18 @@
 # should be paid if this is assigned to anything other then the default, any.
 # This setting can deny access to control of the daemon. Not effective if
 # systemd socket activiation is in use.
-#
+# For local connections only 
+#bind_to_address		"localhost"
 # For network
 #bind_to_address		"any"
 #
 # And for Unix Socket
-#bind_to_address		"~/.mpd/socket"
+bind_to_address		"@TERMUX_PREFIX@/tmp/mpd.socket"
 #
 # This setting is the TCP port that is desired for the daemon to get assigned
-# to.
+# to. Normally this is 6600 but for termux this port needs to be above 8000. 
 #
-#port				"6600"
+#port				"8600"
 #
 # This setting controls the type of information which is logged. Available 
 # setting arguments are "default", "secure" or "verbose". The "verbose" setting
@@ -137,12 +138,12 @@
 # If this setting is set to "yes", MPD will discover audio files by following 
 # symbolic links outside of the configured music_directory.
 #
-#follow_outside_symlinks	"yes"
+follow_outside_symlinks	"yes"
 #
 # If this setting is set to "yes", MPD will discover audio files by following
 # symbolic links inside of the configured music_directory.
 #
-#follow_inside_symlinks		"yes"
+follow_inside_symlinks		"yes"
 #
 ###############################################################################
 
@@ -205,28 +206,6 @@
 # blocks. Setting this block is optional, though the server will only attempt
 # autodetection for one sound card.
 #
-# An example of an ALSA output:
-#
-#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 an OSS output:
-#
-#audio_output {
-#	type		"oss"
-#	name		"My OSS Device"
-##	device		"/dev/dsp"	# optional
-##	mixer_type      "hardware"	# optional
-##	mixer_device	"/dev/mixer"	# optional
-##	mixer_control	"PCM"		# optional
-#}
 #
 # An example of a shout output (for streaming to Icecast):
 #
@@ -257,7 +236,8 @@
 #	type		"recorder"
 #	name		"My recorder"
 #	encoder		"vorbis"		# optional, vorbis or lame
-#	path		"/var/lib/mpd/recorder/mpd.ogg"
+##  for termux changed "path" to somewhere on android that works
+#	path		"~/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"
@@ -286,41 +266,34 @@
 ##	sink		"remote_server_sink"	# optional
 #}
 #
-# An example of a winmm output (Windows multimedia API).
-#
-#audio_output {
-#	type		"winmm"
-#	name		"My WinMM output"
-##	device		"Digital Audio (S/PDIF) (High Definition Audio Device)" # optional
-#		or
-##	device		"0"		# optional
-##	mixer_type	"hardware"	# optional
-#}
+
+# An example of an opensl android output.
+audio_output {
+        type            "sles"
+        name            "OpenSLES output"
+        mixer_type      "software"
+}
+
 #
 # An example of an openal output.
 #
-#audio_output {
-#	type		"openal"
-#	name		"My OpenAL 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		"openal"
+	name		"OpenAL output"
+	mixer_type	"software"
+	device		"OpenSL"
+	enabled		"no"
+}
+#Fifo output for visualizations in ncmpcpp-git
+ audio_output {
+        type            "fifo"
+        name            "ncmpcpp visualizer"
+        path            "~/../usr/tmp/mpd.fifo"
+        format          "44100:16:2"
+	enabled		"no"
+}
+
 #
-#audio_output {
-#	type		"osx"
-#	name		"My OS X Device"
-##	device		"Built-in Output"	# optional
-##	channel_map      "-1,-1,0,1"	# optional
-#}
 #
 ## Example "pipe" output:
 #
Commit	Line	Data
6eeaf551	1	--- ./doc/mpdconf.example 2017-07-18 12:54:14.570036043 +0200
fcac8ce5	2	+++ ./doc/mpdconf.example 2017-07-18 12:56:34.270035990 +0200
49196266	3	@@ -10,14 +10,14 @@
	4	# be disabled and audio files will only be accepted over ipc socket (using
	5	# file:// protocol) or streaming files over an accepted protocol.
	6	#
	7	-#music_directory "~/music"
	8	+music_directory "/sdcard/Music"
	9	#
	10	# This setting sets the MPD internal playlist directory. The purpose of this
	11	# directory is storage for playlists created by MPD. The server will use
	12	# playlist files not created by the server but only if they are in the MPD
	13	# format. This setting defaults to playlist saving being disabled.
	14	#
	15	-#playlist_directory "~/.mpd/playlists"
	16	+playlist_directory "~/.mpd/playlists"
	17	#
	18	# This setting sets the location of the MPD database. This file is used to
	19	# load the database at server start up and store the database while the
	20	@@ -25,7 +25,7 @@
	21	# MPD to accept files over ipc socket (using file:// protocol) or streaming
	22	# files over an accepted protocol.
	23	#
	24	-#db_file "~/.mpd/database"
	25	+db_file "~/.mpd/database"
	26	#
	27	# These settings are the locations for the daemon log files for the daemon.
	28	# These logs are great for troubleshooting, depending on your log_level
	29	@@ -34,25 +34,25 @@
	30	# The special value "syslog" makes MPD use the local syslog daemon. This
	31	# setting defaults to logging to syslog, otherwise logging is disabled.
	32	#
	33	-#log_file "~/.mpd/log"
6eeaf551	34	+#log_file "@TERMUX_HOME@/.mpd/log"
49196266	35	#
	36	# This setting sets the location of the file which stores the process ID
	37	# for use of mpd --kill and some init scripts. This setting is disabled by
	38	# default and the pid file will not be stored.
	39	#
	40	-#pid_file "~/.mpd/pid"
	41	+pid_file "~/.mpd/pid"
	42	#
	43	# This setting sets the location of the file which contains information about
	44	# most variables to get MPD back into the same general shape it was in before
	45	# it was brought down. This setting is disabled by default and the server
	46	# state will be reset on server start up.
	47	#
	48	-#state_file "~/.mpd/state"
	49	+state_file "~/.mpd/state"
	50	#
	51	# The location of the sticker database. This is a database which
	52	# manages dynamic information attached to songs.
	53	#
	54	-#sticker_file "~/.mpd/sticker.sql"
	55	+sticker_file "~/.mpd/sticker.sql"
	56	#
	57	###############################################################################
	58
	59	@@ -77,17 +77,18 @@
	60	# should be paid if this is assigned to anything other then the default, any.
	61	# This setting can deny access to control of the daemon. Not effective if
	62	# systemd socket activiation is in use.
	63	-#
	64	+# For local connections only
	65	+#bind_to_address "localhost"
	66	# For network
	67	#bind_to_address "any"
	68	#
	69	# And for Unix Socket
	70	-#bind_to_address "~/.mpd/socket"
6eeaf551	71	+bind_to_address "@TERMUX_PREFIX@/tmp/mpd.socket"
49196266	72	#
	73	# This setting is the TCP port that is desired for the daemon to get assigned
	74	-# to.
	75	+# to. Normally this is 6600 but for termux this port needs to be above 8000.
	76	#
	77	-#port "6600"
	78	+#port "8600"
	79	#
	80	# This setting controls the type of information which is logged. Available
	81	# setting arguments are "default", "secure" or "verbose". The "verbose" setting
	82	@@ -137,12 +138,12 @@
	83	# If this setting is set to "yes", MPD will discover audio files by following
	84	# symbolic links outside of the configured music_directory.
	85	#
	86	-#follow_outside_symlinks "yes"
	87	+follow_outside_symlinks "yes"
	88	#
	89	# If this setting is set to "yes", MPD will discover audio files by following
	90	# symbolic links inside of the configured music_directory.
	91	#
	92	-#follow_inside_symlinks "yes"
	93	+follow_inside_symlinks "yes"
	94	#
	95	###############################################################################
	96
	97	@@ -205,28 +206,6 @@
	98	# blocks. Setting this block is optional, though the server will only attempt
	99	# autodetection for one sound card.
	100	#
	101	-# An example of an ALSA output:
	102	-#
	103	-#audio_output {
	104	-# type "alsa"
	105	-# name "My ALSA Device"
	106	-## device "hw:0,0" # optional
	107	-## mixer_type "hardware" # optional
	108	-## mixer_device "default" # optional
	109	-## mixer_control "PCM" # optional
	110	-## mixer_index "0" # optional
	111	-#}
	112	-#
	113	-# An example of an OSS output:
	114	-#
	115	-#audio_output {
	116	-# type "oss"
	117	-# name "My OSS Device"
	118	-## device "/dev/dsp" # optional
	119	-## mixer_type "hardware" # optional
	120	-## mixer_device "/dev/mixer" # optional
	121	-## mixer_control "PCM" # optional
	122	-#}
	123	#
	124	# An example of a shout output (for streaming to Icecast):
	125	#
	126	@@ -257,7 +236,8 @@
	127	# type "recorder"
	128	# name "My recorder"
	129	# encoder "vorbis" # optional, vorbis or lame
	130	-# path "/var/lib/mpd/recorder/mpd.ogg"
	131	+## for termux changed "path" to somewhere on android that works
	132	+# path "~/mpd.ogg"
	133	## quality "5.0" # do not define if bitrate is defined
	134	# bitrate "128" # do not define if quality is defined
	135	# format "44100:16:1"
136	@@ -286,41 +266,34 @@
137	## sink "remote_server_sink" # optional
138	#}
139	#
140	-# An example of a winmm output (Windows multimedia API).
141	-#
142	-#audio_output {
143	-# type "winmm"
144	-# name "My WinMM output"
145	-## device "Digital Audio (S/PDIF) (High Definition Audio Device)" # optional
146	-# or
147	-## device "0" # optional
148	-## mixer_type "hardware" # optional
149	-#}
150	+
151	+# An example of an opensl android output.
152	+audio_output {
153	+ type "sles"
154	+ name "OpenSLES output"
155	+ mixer_type "software"
156	+}
157	+
158	#
159	# An example of an openal output.
160	#
161	-#audio_output {
162	-# type "openal"
163	-# name "My OpenAL output"
164	-## device "Digital Audio (S/PDIF) (High Definition Audio Device)" # optional
165	-#}
166	-#
167	-# An example of an sndio output.
168	-#
169	-#audio_output {
170	-# type "sndio"
171	-# name "sndio output"
172	-# mixer_type "software"
173	-#}
174	-#
175	-# An example of an OS X output:
176	+audio_output {
177	+ type "openal"
178	+ name "OpenAL output"
179	+ mixer_type "software"
180	+ device "OpenSL"
181	+ enabled "no"
182	+}
183	+#Fifo output for visualizations in ncmpcpp-git
184	+ audio_output {
185	+ type "fifo"
186	+ name "ncmpcpp visualizer"
187	+ path "~/../usr/tmp/mpd.fifo"
d555e5ab	188	+ format "44100:16:2"
49196266	189	+ enabled "no"
	190	+}
	191	+
	192	#
	193	-#audio_output {
	194	-# type "osx"
	195	-# name "My OS X Device"
	196	-## device "Built-in Output" # optional
	197	-## channel_map "-1,-1,0,1" # optional
	198	-#}
	199	#
	200	## Example "pipe" output:
	201	#