From: Andre <maan@p133.(none)>
Date: Thu, 9 Mar 2006 15:36:56 +0000 (+0100)
Subject: Merge branch 'no_colon_separators'
X-Git-Tag: v0.2.11~33
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=418339759697ff6884e77c809805645c5f4db5b5;hp=7faaa32fe3910e5689b2b49d8c5a9be85e5d46ce;p=paraslash.git

Merge branch 'no_colon_separators'
---

diff --git a/filter.c b/filter.c
index 37c1c430..46b48251 100644
--- a/filter.c
+++ b/filter.c
@@ -95,7 +95,7 @@ static void open_filters(void)
 static int parse_config(int argc, char *argv[])
 {
 	static char *cf; /* config file */
-        struct stat statbuf;
+	struct stat statbuf;
 	int i;
 
 	if (cmdline_parser(argc, argv, &conf))
@@ -105,7 +105,7 @@ static int parse_config(int argc, char *argv[])
 		cf = make_message("%s/.paraslash/filter.conf", home);
 		free(home);
 	}
-        if (!stat(cf, &statbuf)) {
+	if (!stat(cf, &statbuf)) {
 		if (cmdline_parser_configfile(cf, &conf, 0, 0, 0))
 			return -E_FILTER_SYNTAX;
 	}
@@ -113,8 +113,10 @@ static int parse_config(int argc, char *argv[])
 		return 1;
 	printf("available filters: ");
 	for (i = 0; filters[i].name; i++)
-		printf("%s%s", i? " " : "", filters[i].name);
-	printf("\nTry para_filter -f<filtername>:-h for help on <filtername>\n");
+		printf("%s%s%s", i? " " : "", filters[i].name,
+			filters[i].parse_config? "*": "");
+	printf("\nFilters marked with \"*\" have further command line options. Try\n"
+		"\tpara_filter -f '<filtername> -h'\nfor more information.\n");
 	exit(EXIT_SUCCESS);
 }
 
diff --git a/filter.ggo b/filter.ggo
index 4157835c..725a9030 100644
--- a/filter.ggo
+++ b/filter.ggo
@@ -7,11 +7,10 @@ way.  The same filter may appear more than once,
 order matters.
 
 Filter options may be specified for each '-f'
-option separately. Insinde these options ':'
-must be used as the separator instead of white
-space. Example:
+option separately. Note that you will have to
+quote these options like this:
 
-	-f compress:--anticlip:--volume:2
+	-f 'compress --anticlip --volume 2'
 "
 string typestr="filter_spec" no multiple
 
diff --git a/filter_chain.c b/filter_chain.c
index 6265f19c..42db3783 100644
--- a/filter_chain.c
+++ b/filter_chain.c
@@ -211,7 +211,7 @@ static int parse_filter_args(int filter_num, char *options, void **conf)
 /**
  * check the filter command line options
  *
- * \param fa the command line options (values separated by colons)
+ * \param fa the command line options
  * \param conf points to the filter configuration upon successful return
  *
  * Check if \a fa starts with a the name of a supported filter, followed by
diff --git a/scripts/demo-script b/scripts/demo-script
index 003aa7b0..9e12e803 100755
--- a/scripts/demo-script
+++ b/scripts/demo-script
@@ -6,15 +6,15 @@ dir="$HOME/.paraslash"
 client_conf="$dir/client.conf"
 audioc_conf="$dir/audioc.conf"
 server=www.paraslash.org
-proj=paraslash-0.2.10
+proj=paraslash-git
 df=$proj.tar.bz2 # download file
 url=http://$server/versions/$df
 kf="$dir/key.anonymous" # key file
 key_url=http://$server/key.anonymous
 socket="$dir/socket"
-receiver_opts="mp3:http:-i:$server:-p:8009"
+receiver_opts="mp3:http -i $server -p 8009"
 audiod_log="$dir/audiod.log"
-audiod_opts="-FDdr $receiver_opts -L $audiod_log -s $socket"
+audiod_opts="-FDd -L $audiod_log -s $socket"
 msg()
 {
 	echo "`date`: $1"
@@ -46,8 +46,8 @@ EOF
 	msg "writing $audioc_conf"
 	echo "socket \"$socket\"" > "$audioc_conf"
 	(para_audioc term; killall para_audiod para_client) >> "$log" 2>&1
-	msg "para_audiod $audiod_opts"
-	para_audiod $audiod_opts -w "mp3:mpg123 -"
+	msg "para_audiod $audiod_opts -r '$receiver_opts'"
+	para_audiod $audiod_opts -r "$receiver_opts" -w "mp3:mpg123 -"
 	echo "hit return to start para_gui, hit ctrl+c to abort"
 	read
 	para_gui