X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=INSTALL;h=f0d1ec8cedc70f9b9076df56d6dc9260416e0278;hp=9d82c9bf239bc130ce3eb1b1b7782558a1e5fa97;hb=5d506faba5e49d3fc7eecb5b7d80b515241871d4;hpb=c141cc6915a32fb92766dc27f0df222d13f27d8b

diff --git a/INSTALL b/INSTALL
index 9d82c9bf..f0d1ec8c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -76,28 +76,28 @@ example) and try
 to retrieve the list of available commands and some server info.
 
 
-Choose your database tool (dbtool)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-You have two 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.
+	The random selector chooses files randomly from the given
+	directory.
 
-	2. If you can not use the mysql dbtool and you just want
-	to quickly make paraslash working, use the random dbtool.
-	The directory which is searched for audio files can be given
-	via the server option --random_dbtool_dir.
+	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.
 
-	Note, however, that this database tool is really dopey. It
-	scans the given directory on every audio file change and
-	chooses one randomly. There is no further functionality.
+	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.
 
-The current database tool can be changed at runtime via
+The current audio file selector 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.
+	para_client chs new_selector
 
 
 Start streaming manually
@@ -115,19 +115,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_write -w alsa
+	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_write -w alsa
 
 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
 ~~~~~~~~~~~~~~~~~~~~~
@@ -142,7 +142,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"
@@ -173,23 +173,23 @@ information in a curses window. It also allows you to bind keys to
 arbitrary commands. There are several flavours of key-bindings:
 
 	o internal: These are the built-in commands that can not be
-	  changed (help, quit, loglevel, version...).
+	changed (help, quit, loglevel, version...).
 
-        o external: Shutdown curses before launching the given command.
-          Useful for starting other ncurses programs from within
-          para_gui, e.g. aumix or para_dbadm. Or, use
+	o external: Shutdown curses before launching the given command.
+	Useful for starting other ncurses programs from within
+	para_gui, e.g. aumix or para_dbadm. Or, use
 
 		para_client mbox
 
-	  to write a mailbox containing one mail for each file
-          in the mysql database and start mutt from within para_gui
-          to browse your collection!
+	to write a mailbox containing one mail for each file
+	in the mysql database and start mutt from within para_gui
+	to browse your collection!
 
 	o display: Launch the command and display its stdout in
-	  para_gui's bottom window.
+	para_gui's bottom window.
 
 	o para: Like display, but start "para_client <specified
-	  command>" instead of "<specified command>".
+	command>" instead of "<specified command>".
 
 
 That's all, congratulations. Check out all the other optional gimmics!