X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=INSTALL;h=04bf53fda45ea1892ec417a139d2a8f7704b6bf1;hp=3b3731814de256e127a98e09e4053590e5376090;hb=9ebd69fa0ad93040ca37190e1b71683d027095e9;hpb=2ed89c59f0efcd0a2763f47c7d3455663241e623

diff --git a/INSTALL b/INSTALL
index 3b373181..04bf53fd 100644
--- a/INSTALL
+++ b/INSTALL
@@ -76,33 +76,29 @@ example) and try
 to retrieve the list of available commands and some server info.
 
 
-Choose your database tool (dbtool)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-You have three options:
+Choose an audio file selector
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+paraslash has three different audio file selectors: random (default),
+playlist and mysql.
 
-	1. Use the mysql dbtool which comes with paraslash and requires
-	mysql. This is recommended.
+	The random selector chooses files randomly from the given
+	directory.
 
-	2. Use your own database tool. If you have that already,
-	skip this step.
+	The playlist selector allows to send a playlist to para_server
+	via the lpl (load playlist) command. para_server will choose
+	files from the loaded playlist in sequential order.
 
-	3. If you can not use the mysql dbtool and you just want
-	to quickly make paraslash working, use the dopey dbtool.
-	The directory which is searched for audio files can be given
-	via the server option --dopey_dir.
+	The mysql selector stores information about your audio
+	files in a mysql database. It is much more involved than
+	the other two selectors and lets you chose files in many
+	interesting ways. If you like to use the mysql selector,
+	read README.mysql and follow the instructions given there.
+	Return to this document when ready.
 
-	Note, however, that dopey is _really_ dopey. It scans
-	$dopey_dir on every audio file change and chooses one
-	randomly. You get the idea. Have a look at its source code
-	and feel free to modify.
+The current audio file selector can be changed at runtime via
 
+	para_client cdt new_selector
 
-The current database tool can be changed at runtime via
-
-	para_client cdt new_dbtool
-
-If you have choosen 1. above, read README.mysql and follow the
-instructions given there.  Return to this document when ready.
 
 
 Start streaming manually
@@ -120,19 +116,19 @@ on client_host:
 
 	mp3:
 
-		para_recv -r http:-i:server_host | para_filter -f mp3 -f wav | para_play
-		or
-		mpg123 http://server_host:8000/
-		or
-		xmms http://server_host:8000/
+	para_recv -r 'http -i server_host' | para_filter -f mp3dec -f wav | para_play
+	or
+	mpg123 http://server_host:8000/
+	or
+	xmms http://server_host:8000/
 
 	ogg:
 
-		para_recv -r http:-i:server_host | para_filter -f ogg -f wav | para_play
+	para_recv -r 'http -i server_host' | para_filter -f oggdec -f wav | para_play
 
 If this works, proceede. Otherwise doublecheck what is logged by
-para_server and use the --loglevel option of para_recv to increase
-verbosity.
+para_server and use the --loglevel option of para_recv, para_filter
+to increase verbosity.
 
 Configure para_audiod
 ~~~~~~~~~~~~~~~~~~~~~
@@ -147,7 +143,7 @@ the audio stream. Try
 for help. Usually you have to specify at least server_host as the
 receiver specifier, like this:
 
-	-r http:-i:server_host
+	-r 'mp3:http -i server_host'
 
 The prefered way to use para_audiod is to run it once at system start
 as an unprivileged user. para_audiod needs to create a "well-known"