From 2d87bd2d2f088220ccf98af93073cfd807dc2d1b Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 20 Sep 2004 20:52:35 +0000
Subject: documentation update

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@225 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 polyp/default.pa       | 14 +++++++-------
 polyp/main.c           |  4 +++-
 polyp/module-combine.c |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'polyp')

diff --git a/polyp/default.pa b/polyp/default.pa
index ae1fbfcb..a3aaa7c8 100755
--- a/polyp/default.pa
+++ b/polyp/default.pa
@@ -1,4 +1,4 @@
-#!./polypaudio -rnF 
+#!./polypaudio -nF 
 
 #
 # This file is part of polypaudio.
@@ -28,12 +28,12 @@ load-module module-oss device="/dev/dsp" sink_name=output source_name=input reco
 
 # Load audio drivers automatically on access
 
-#add-autoload_sink output module-oss device="/dev/dsp" sink_name=output source_name=input
-#add-autoload_source input module-oss device="/dev/dsp" sink_name=output source_name=input
-#add-autoload_sink output module-oss-mmap device="/dev/dsp" sink_name=output source_name=input
-#add-autoload_source input module-oss-mmap device="/dev/dsp" sink_name=output source_name=input
-#add-autoload_sink output module-alsa-sink sink_name=output
-#add-autoload_source input module-alsa-source source_name=input
+#add-autoload-sink output module-oss device="/dev/dsp" sink_name=output source_name=input
+#add-autoload-source input module-oss device="/dev/dsp" sink_name=output source_name=input
+#add-autoload-sink output module-oss-mmap device="/dev/dsp" sink_name=output source_name=input
+#add-autoload-source input module-oss-mmap device="/dev/dsp" sink_name=output source_name=input
+#add-autoload-sink output module-alsa-sink sink_name=output
+#add-autoload-source input module-alsa-source source_name=input
 
 # Load several protocols
 load-module module-esound-protocol-tcp
diff --git a/polyp/main.c b/polyp/main.c
index 10774388..dfbd1e4b 100644
--- a/polyp/main.c
+++ b/polyp/main.c
@@ -180,12 +180,14 @@ int main(int argc, char *argv[]) {
                 retval = 1;
             }
 
+            if (conf->verbose)
+                pa_log(__FILE__": daemon startup %s.\n", retval ? "failed" : "succeeded");
+            
             goto finish;
         }
 
         close(daemon_pipe[0]);
         daemon_pipe[0] = -1;
-        
 
         if (conf->auto_log_target)
             pa_log_set_target(PA_LOG_SYSLOG, NULL);
diff --git a/polyp/module-combine.c b/polyp/module-combine.c
index 1bb183ec..6952ce6c 100644
--- a/polyp/module-combine.c
+++ b/polyp/module-combine.c
@@ -40,7 +40,7 @@
 PA_MODULE_AUTHOR("Lennart Poettering")
 PA_MODULE_DESCRIPTION("Combine multiple sinks to one")
 PA_MODULE_VERSION(PACKAGE_VERSION)
-PA_MODULE_USAGE("sink_name=<name for the sink> master=<master sink> slave=<slave sinks> adjust_time=<seconds> resample_method=<method>")
+PA_MODULE_USAGE("sink_name=<name for the sink> master=<master sink> slaves=<slave sinks> adjust_time=<seconds> resample_method=<method>")
 
 #define DEFAULT_SINK_NAME "combined"
 #define MEMBLOCKQ_MAXLENGTH (1024*170)
-- 
cgit