From 07e6f44e588cefcc70aa4d48eebef81a963291d8 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Wed, 22 Mar 2023 16:35:55 +0100
Subject: [PATCH] modules: clean up USAGE arguments

use () to mark optional arguments to avoid confusion with arrays.
Add some more optional arguments.
---
 src/modules/module-access.c            |  8 +++---
 src/modules/module-adapter.c           |  2 +-
 src/modules/module-combine-stream.c    | 18 +++++++-------
 src/modules/module-echo-cancel.c       | 26 ++++++++++----------
 src/modules/module-example-sink.c      | 16 ++++++------
 src/modules/module-example-source.c    | 16 ++++++------
 src/modules/module-fallback-sink.c     |  4 +--
 src/modules/module-filter-chain.c      | 26 +++++++++++---------
 src/modules/module-link-factory.c      | 12 ++++-----
 src/modules/module-loopback.c          | 18 +++++++-------
 src/modules/module-pipe-tunnel.c       | 24 +++++++++---------
 src/modules/module-protocol-simple.c   | 26 ++++++++++----------
 src/modules/module-pulse-tunnel.c      | 24 +++++++++---------
 src/modules/module-raop-discover.c     |  2 +-
 src/modules/module-raop-sink.c         | 32 ++++++++++++------------
 src/modules/module-roc-sink.c          | 12 ++++-----
 src/modules/module-roc-source.c        | 16 ++++++------
 src/modules/module-rt.c                |  8 +++---
 src/modules/module-rtp-sap.c           | 16 ++++++------
 src/modules/module-rtp-session.c       | 30 +++++++++++------------
 src/modules/module-rtp-sink.c          | 34 +++++++++++++-------------
 src/modules/module-rtp-source.c        | 20 +++++++--------
 src/modules/module-x11-bell.c          |  8 +++---
 src/modules/module-zeroconf-discover.c |  2 +-
 24 files changed, 200 insertions(+), 200 deletions(-)

diff --git a/src/modules/module-access.c b/src/modules/module-access.c
index 224d60435..9948d3953 100644
--- a/src/modules/module-access.c
+++ b/src/modules/module-access.c
@@ -111,10 +111,10 @@
 PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
 #define PW_LOG_TOPIC_DEFAULT mod_topic
 
-#define MODULE_USAGE	"[ access.force=flatpak ] "		\
-			"[ access.allowed=<cmd-line> ] "	\
-			"[ access.rejected=<cmd-line> ] "	\
-			"[ access.restricted=<cmd-line> ] "	\
+#define MODULE_USAGE	"( access.force=flatpak ) "		\
+			"( access.allowed= [ <cmd-line>,.. ] ) "	\
+			"( access.rejected= [ <cmd-line>,.. ] ) "	\
+			"( access.restricted= [ <cmd-line>,.. ] ) "	\
 
 static const struct spa_dict_item module_props[] = {
 	{ PW_KEY_MODULE_AUTHOR, "Wim Taymans <wim.taymans@gmail.com>" },
diff --git a/src/modules/module-adapter.c b/src/modules/module-adapter.c
index 75cc08930..2c26dd3f0 100644
--- a/src/modules/module-adapter.c
+++ b/src/modules/module-adapter.c
@@ -26,7 +26,7 @@ PW_LOG_TOPIC(mod_topic, "mod." NAME);
 #define PW_LOG_TOPIC_DEFAULT mod_topic
 
 #define FACTORY_USAGE	SPA_KEY_FACTORY_NAME"=<factory-name> " \
-			"["SPA_KEY_LIBRARY_NAME"=<library-name>] " \
+			"("SPA_KEY_LIBRARY_NAME"=<library-name>) " \
 			ADAPTER_USAGE
 
 static const struct spa_dict_item module_props[] = {
diff --git a/src/modules/module-combine-stream.c b/src/modules/module-combine-stream.c
index 73aa8c420..0dc10f0d8 100644
--- a/src/modules/module-combine-stream.c
+++ b/src/modules/module-combine-stream.c
@@ -198,15 +198,15 @@ PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
 #define DEFAULT_CHANNELS 2
 #define DEFAULT_POSITION "[ FL FR ]"
 
-#define MODULE_USAGE	"[ node.latency=<latency as fraction> ] "				\
-			"[ combine.mode=<mode of stream, playback|capture|sink|source>, default:sink ] "	\
-			"[ node.name=<name of the stream> ] "					\
-			"[ node.description=<description of the stream> ] "			\
-			"[ audio.channels=<number of channels, default:"SPA_STRINGIFY(DEFAULT_CHANNELS) "> ] "	\
-			"[ audio.position=<channel map, default:"DEFAULT_POSITION"> ] "		\
-			"[ combine.props=<properties> ] "						\
-			"[ stream.props=<properties> ] "					\
-			"[ stream.rules=<properties> ] "
+#define MODULE_USAGE	"( node.latency=<latency as fraction> ) "				\
+			"( combine.mode=<mode of stream, playback|capture|sink|source>, default:sink ) "	\
+			"( node.name=<name of the stream> ) "					\
+			"( node.description=<description of the stream> ) "			\
+			"( audio.channels=<number of channels, default:"SPA_STRINGIFY(DEFAULT_CHANNELS) "> ) "	\
+			"( audio.position=<channel map, default:"DEFAULT_POSITION"> ) "		\
+			"( combine.props=<properties> ) "					\
+			"( stream.props=<properties> ) "					\
+			"( stream.rules=<properties> ) "
 
 
 static const struct spa_dict_item module_props[] = {
diff --git a/src/modules/module-echo-cancel.c b/src/modules/module-echo-cancel.c
index b0db1cc04..0cdcf5e56 100644
--- a/src/modules/module-echo-cancel.c
+++ b/src/modules/module-echo-cancel.c
@@ -157,19 +157,19 @@ PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
 static const struct spa_dict_item module_props[] = {
 	{ PW_KEY_MODULE_AUTHOR, "Wim Taymans <wim.taymans@gmail.com>" },
 	{ PW_KEY_MODULE_DESCRIPTION, "Echo Cancellation" },
-	{ PW_KEY_MODULE_USAGE, " [ remote.name=<remote> ] "
-				"[ node.latency=<latency as fraction> ] "
-				"[ audio.rate=<sample rate> ] "
-				"[ audio.channels=<number of channels> ] "
-				"[ audio.position=<channel map> ] "
-				"[ buffer.max_size=<max buffer size in ms> ] "
-				"[ buffer.play_delay=<delay as fraction> ] "
-				"[ library.name =<library name> ] "
-				"[ aec.args=<aec arguments> ] "
-				"[ capture.props=<properties> ] "
-				"[ source.props=<properties> ] "
-				"[ sink.props=<properties> ] "
-				"[ playback.props=<properties> ] " },
+	{ PW_KEY_MODULE_USAGE, " ( remote.name=<remote> ) "
+				"( node.latency=<latency as fraction> ) "
+				"( audio.rate=<sample rate> ) "
+				"( audio.channels=<number of channels> ) "
+				"( audio.position=<channel map> ) "
+				"( buffer.max_size=<max buffer size in ms> ) "
+				"( buffer.play_delay=<delay as fraction> ) "
+				"( library.name =<library name> ) "
+				"( aec.args=<aec arguments> ) "
+				"( capture.props=<properties> ) "
+				"( source.props=<properties> ) "
+				"( sink.props=<properties> ) "
+				"( playback.props=<properties> ) " },
 	{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION },
 };
 
diff --git a/src/modules/module-example-sink.c b/src/modules/module-example-sink.c
index a14ee6ff5..7413933c3 100644
--- a/src/modules/module-example-sink.c
+++ b/src/modules/module-example-sink.c
@@ -83,14 +83,14 @@ PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
 #define DEFAULT_CHANNELS 2
 #define DEFAULT_POSITION "[ FL FR ]"
 
-#define MODULE_USAGE	"[ node.latency=<latency as fraction> ] "				\
-			"[ node.name=<name of the nodes> ] "					\
-			"[ node.description=<description of the nodes> ] "			\
-			"[ audio.format=<format, default:"DEFAULT_FORMAT"> ] "			\
-			"[ audio.rate=<sample rate, default: "SPA_STRINGIFY(DEFAULT_RATE)"> ] "			\
-			"[ audio.channels=<number of channels, default:"SPA_STRINGIFY(DEFAULT_CHANNELS) "> ] "	\
-			"[ audio.position=<channel map, default:"DEFAULT_POSITION"> ] "		\
-			"[ stream.props=<properties> ] "
+#define MODULE_USAGE	"( node.latency=<latency as fraction> ) "				\
+			"( node.name=<name of the nodes> ) "					\
+			"( node.description=<description of the nodes> ) "			\
+			"( audio.format=<format, default:"DEFAULT_FORMAT"> ) "			\
+			"( audio.rate=<sample rate, default: "SPA_STRINGIFY(DEFAULT_RATE)"> ) "			\
+			"( audio.channels=<number of channels, default:"SPA_STRINGIFY(DEFAULT_CHANNELS) "> ) "	\
+			"( audio.position=<channel map, default:"DEFAULT_POSITION"> ] "		\
+			"( stream.props=<properties> ) "
 
 
 static const struct spa_dict_item module_props[] = {
diff --git a/src/modules/module-example-source.c b/src/modules/module-example-source.c
index 635f4af03..e6be6717e 100644
--- a/src/modules/module-example-source.c
+++ b/src/modules/module-example-source.c
@@ -83,14 +83,14 @@ PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
 #define DEFAULT_CHANNELS 2
 #define DEFAULT_POSITION "[ FL FR ]"
 
-#define MODULE_USAGE	"[ node.latency=<latency as fraction> ] "				\
-			"[ node.name=<name of the nodes> ] "					\
-			"[ node.description=<description of the nodes> ] "			\
-			"[ audio.format=<format, default:"DEFAULT_FORMAT"> ] "			\
-			"[ audio.rate=<sample rate, default: "SPA_STRINGIFY(DEFAULT_RATE)"> ] "			\
-			"[ audio.channels=<number of channels, default:"SPA_STRINGIFY(DEFAULT_CHANNELS) "> ] "	\
-			"[ audio.position=<channel map, default:"DEFAULT_POSITION"> ] "		\
-			"[ stream.props=<properties> ] "
+#define MODULE_USAGE	"( node.latency=<latency as fraction> ) "				\
+			"( node.name=<name of the nodes> ) "					\
+			"( node.description=<description of the nodes> ) "			\
+			"( audio.format=<format, default:"DEFAULT_FORMAT"> ) "			\
+			"( audio.rate=<sample rate, default: "SPA_STRINGIFY(DEFAULT_RATE)"> ) "			\
+			"( audio.channels=<number of channels, default:"SPA_STRINGIFY(DEFAULT_CHANNELS) "> ) "	\
+			"( audio.position=<channel map, default:"DEFAULT_POSITION"> ) "		\
+			"( stream.props=<properties> ) "
 
 
 static const struct spa_dict_item module_props[] = {
diff --git a/src/modules/module-fallback-sink.c b/src/modules/module-fallback-sink.c
index 4474fc124..17f0f505c 100644
--- a/src/modules/module-fallback-sink.c
+++ b/src/modules/module-fallback-sink.c
@@ -33,8 +33,8 @@
 PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
 #define PW_LOG_TOPIC_DEFAULT mod_topic
 
-#define MODULE_USAGE	("[ sink.name=<str> ] " \
-			"[ sink.description=<str> ] ")
+#define MODULE_USAGE	("( sink.name=<str> ) " \
+			"( sink.description=<str> ) ")
 
 static const struct spa_dict_item module_props[] = {
 	{ PW_KEY_MODULE_AUTHOR, "Pauli Virtanen <pav@iki.fi>" },
diff --git a/src/modules/module-filter-chain.c b/src/modules/module-filter-chain.c
index 784896523..7073baa4b 100644
--- a/src/modules/module-filter-chain.c
+++ b/src/modules/module-filter-chain.c
@@ -62,7 +62,7 @@ PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
  *     filter.graph = {
  *         nodes = [
  *             {
- *                 type = <ladspa | lv2 | builtin>
+ *                 type = <ladspa | lv2 | builtin | sofa>
  *                 name = <name>
  *                 plugin = <plugin>
  *                 label = <label>
@@ -102,9 +102,11 @@ PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
  *    - For LV2 this is unused
  *    - For builtin and sofa this is the name of the filter to use
  *
- * - `config` contains a filter specific configuration section. The convolver
- *            plugin needs this.
+ * - `config` contains a filter specific configuration section. Some plugins need
+ *            this. (convolver, sofa, delay, ...)
  * - `control` contains the initial values for the control ports of the filter.
+ *            normally these are given with the port name but it is also possible
+ *            to give the control index as the key.
  *
  * ### Links
  *
@@ -435,16 +437,16 @@ PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
 static const struct spa_dict_item module_props[] = {
 	{ PW_KEY_MODULE_AUTHOR, "Wim Taymans <wim.taymans@gmail.com>" },
 	{ PW_KEY_MODULE_DESCRIPTION, "Create filter chain streams" },
-	{ PW_KEY_MODULE_USAGE, " [ remote.name=<remote> ] "
-				"[ node.latency=<latency as fraction> ] "
-				"[ node.description=<description of the nodes> ] "
-				"[ audio.rate=<sample rate> ] "
-				"[ audio.channels=<number of channels> ] "
-				"[ audio.position=<channel map> ] "
+	{ PW_KEY_MODULE_USAGE, " ( remote.name=<remote> ) "
+				"( node.latency=<latency as fraction> ) "
+				"( node.description=<description of the nodes> ) "
+				"( audio.rate=<sample rate> ) "
+				"( audio.channels=<number of channels> ) "
+				"( audio.position=<channel map> ) "
 				"filter.graph = [ "
 				"    nodes = [ "
 				"        { "
-				"          type = <ladspa | lv2 | builtin> "
+				"          type = <ladspa | lv2 | builtin | sofa> "
 				"          name = <name> "
 				"          plugin = <plugin> "
 				"          label = <label> "
@@ -462,8 +464,8 @@ static const struct spa_dict_item module_props[] = {
 				"    inputs = [ <portname> ... ] "
 				"    outputs = [ <portname> ... ] "
 				"] "
-				"[ capture.props=<properties> ] "
-				"[ playback.props=<properties> ] " },
+				"( capture.props=<properties> ) "
+				"( playback.props=<properties> ) " },
 	{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION },
 };
 
diff --git a/src/modules/module-link-factory.c b/src/modules/module-link-factory.c
index 3e0b0651f..125082fb2 100644
--- a/src/modules/module-link-factory.c
+++ b/src/modules/module-link-factory.c
@@ -22,12 +22,12 @@
 PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
 #define PW_LOG_TOPIC_DEFAULT mod_topic
 
-#define FACTORY_USAGE	PW_KEY_LINK_OUTPUT_NODE"=<output-node> "	\
-			"["PW_KEY_LINK_OUTPUT_PORT"=<output-port>] "	\
-			PW_KEY_LINK_INPUT_NODE"=<input-node> "		\
-			"["PW_KEY_LINK_INPUT_PORT"=<input-port>] "	\
-			"["PW_KEY_OBJECT_LINGER"=<bool>] "		\
-			"["PW_KEY_LINK_PASSIVE"=<bool>]"
+#define FACTORY_USAGE	"("PW_KEY_LINK_OUTPUT_NODE"=<output-node>) "	\
+			"("PW_KEY_LINK_OUTPUT_PORT"=<output-port>) "	\
+			"("PW_KEY_LINK_INPUT_NODE"=<input-node>) "	\
+			"("PW_KEY_LINK_INPUT_PORT"=<input-port>) "	\
+			"("PW_KEY_OBJECT_LINGER"=<bool>) "		\
+			"("PW_KEY_LINK_PASSIVE"=<bool>)"
 
 static const struct spa_dict_item module_props[] = {
 	{ PW_KEY_MODULE_AUTHOR, "Wim Taymans <wim.taymans@gmail.com>" },
diff --git a/src/modules/module-loopback.c b/src/modules/module-loopback.c
index f9bd46760..34ef87b29 100644
--- a/src/modules/module-loopback.c
+++ b/src/modules/module-loopback.c
@@ -130,15 +130,15 @@ PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
 static const struct spa_dict_item module_props[] = {
 	{ PW_KEY_MODULE_AUTHOR, "Wim Taymans <wim.taymans@gmail.com>" },
 	{ PW_KEY_MODULE_DESCRIPTION, "Create loopback streams" },
-	{ PW_KEY_MODULE_USAGE, " [ remote.name=<remote> ] "
-				"[ node.latency=<latency as fraction> ] "
-				"[ node.description=<description of the nodes> ] "
-				"[ audio.rate=<sample rate> ] "
-				"[ audio.channels=<number of channels> ] "
-				"[ audio.position=<channel map> ] "
-				"[ target.delay.sec=<delay as seconds in float> ] "
-				"[ capture.props=<properties> ] "
-				"[ playback.props=<properties> ] " },
+	{ PW_KEY_MODULE_USAGE, " ( remote.name=<remote> ) "
+				"( node.latency=<latency as fraction> ) "
+				"( node.description=<description of the nodes> ) "
+				"( audio.rate=<sample rate> ) "
+				"( audio.channels=<number of channels> ) "
+				"( audio.position=<channel map> ) "
+				"( target.delay.sec=<delay as seconds in float> ) "
+				"( capture.props=<properties> ) "
+				"( playback.props=<properties> ) " },
 	{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION },
 };
 
diff --git a/src/modules/module-pipe-tunnel.c b/src/modules/module-pipe-tunnel.c
index 14d34f6e3..9581bc2ca 100644
--- a/src/modules/module-pipe-tunnel.c
+++ b/src/modules/module-pipe-tunnel.c
@@ -114,18 +114,18 @@
 PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
 #define PW_LOG_TOPIC_DEFAULT mod_topic
 
-#define MODULE_USAGE	"[ remote.name=<remote> ] "				\
-			"[ node.latency=<latency as fraction> ] "		\
-			"[ node.name=<name of the nodes> ] "			\
-			"[ node.description=<description of the nodes> ] "	\
-			"[ target.object=<remote node target name or serial> ] "\
-			"[ audio.format=<sample format> ] "			\
-			"[ audio.rate=<sample rate> ] "				\
-			"[ audio.channels=<number of channels> ] "		\
-			"[ audio.position=<channel map> ] "			\
-			"[ tunnel.mode=capture|playback|sink|source "		\
-			"[ pipe.filename=<filename> ]"				\
-			"[ stream.props=<properties> ] "
+#define MODULE_USAGE	"( remote.name=<remote> ) "				\
+			"( node.latency=<latency as fraction> ) "		\
+			"( node.name=<name of the nodes> ) "			\
+			"( node.description=<description of the nodes> ) "	\
+			"( target.object=<remote node target name or serial> ) "\
+			"( audio.format=<sample format> ) "			\
+			"( audio.rate=<sample rate> ) "				\
+			"( audio.channels=<number of channels> ) "		\
+			"( audio.position=<channel map> ) "			\
+			"( tunnel.mode=capture|playback|sink|source )"		\
+			"( pipe.filename=<filename> )"				\
+			"( stream.props=<properties> ) "
 
 
 static const struct spa_dict_item module_props[] = {
diff --git a/src/modules/module-protocol-simple.c b/src/modules/module-protocol-simple.c
index 6fbaadd1e..697a6b841 100644
--- a/src/modules/module-protocol-simple.c
+++ b/src/modules/module-protocol-simple.c
@@ -49,7 +49,7 @@
  *  - `capture.node`: an optional node serial or name to use for capture.
  *  - `playback.node`: an optional node serial or name to use for playback.
  *  - `server.address = []`: an array of server addresses to listen on as
- *                            tcp:<ip>:<port>.
+ *                            tcp:(<ip>:)<port>.
  *
  * ## General options
  *
@@ -119,18 +119,18 @@ PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
 
 #define MAX_CLIENTS	10
 
-#define MODULE_USAGE	"[ capture=<bool> ] "						\
-			"[ playback=<bool> ] "						\
-			"[ remote.name=<remote> ] "					\
-			"[ node.latency=<num/denom, default:"DEFAULT_LATENCY"> ] "	\
-			"[ node.rate=<1/rate, default:1/"SPA_STRINGIFY(DEFAULT_RATE)"> ] "	\
-			"[ capture.node=<source-target> [ stream.capture.sink=true ]] "	\
-			"[ playback.node=<sink-target> ] "				\
-			"[ audio.rate=<sample-rate, default:"SPA_STRINGIFY(DEFAULT_RATE)"> ] "		\
-			"[ audio.format=<format, default:"DEFAULT_FORMAT"> ] "		\
-			"[ audio.channels=<channels, default: "SPA_STRINGIFY(DEFAULT_CHANNELS)"> ] "	\
-			"[ audio.position=<position, default:"DEFAULT_POSITION"> ] "	\
-			"[ server.address=<[ tcp:[<ip>:]<port>[,...] ], default:"DEFAULT_SERVER">"	\
+#define MODULE_USAGE	"( capture=<bool> ) "						\
+			"( playback=<bool> ) "						\
+			"( remote.name=<remote> ) "					\
+			"( node.latency=<num/denom, default:"DEFAULT_LATENCY"> ) "	\
+			"( node.rate=<1/rate, default:1/"SPA_STRINGIFY(DEFAULT_RATE)"> ) "	\
+			"( capture.node=<source-target> ( stream.capture.sink=true )) "	\
+			"( playback.node=<sink-target> ) "				\
+			"( audio.rate=<sample-rate, default:"SPA_STRINGIFY(DEFAULT_RATE)"> ) "		\
+			"( audio.format=<format, default:"DEFAULT_FORMAT"> ) "		\
+			"( audio.channels=<channels, default: "SPA_STRINGIFY(DEFAULT_CHANNELS)"> ) "	\
+			"( audio.position=<position, default:"DEFAULT_POSITION"> ) "	\
+			"( server.address=<[ tcp:(<ip>:)<port>(,...) ], default:"DEFAULT_SERVER"> )"	\
 
 static const struct spa_dict_item module_props[] = {
 	{ PW_KEY_MODULE_AUTHOR, "Wim Taymans <wim.taymans@gmail.com>" },
diff --git a/src/modules/module-pulse-tunnel.c b/src/modules/module-pulse-tunnel.c
index b92b534de..d30d50805 100644
--- a/src/modules/module-pulse-tunnel.c
+++ b/src/modules/module-pulse-tunnel.c
@@ -106,19 +106,19 @@ PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
 #define DEFAULT_CHANNELS 2
 #define DEFAULT_POSITION "[ FL FR ]"
 
-#define MODULE_USAGE	"[ remote.name=<remote> ] "				\
-			"[ node.latency=<latency as fraction> ] "		\
-			"[ node.name=<name of the nodes> ] "			\
-			"[ node.description=<description of the nodes> ] "	\
-			"[ node.target=<remote node target name or serial> ] "	\
-			"[ audio.format=<sample format> ] "			\
-			"[ audio.rate=<sample rate> ] "				\
-			"[ audio.channels=<number of channels> ] "		\
-			"[ audio.position=<channel map> ] "			\
+#define MODULE_USAGE	"( remote.name=<remote> ] "				\
+			"( node.latency=<latency as fraction> ] "		\
+			"( node.name=<name of the nodes> ] "			\
+			"( node.description=<description of the nodes> ] "	\
+			"( node.target=<remote node target name or serial> ] "	\
+			"( audio.format=<sample format> ] "			\
+			"( audio.rate=<sample rate> ] "				\
+			"( audio.channels=<number of channels> ] "		\
+			"( audio.position=<channel map> ] "			\
 			"pulse.server.address=<address> "			\
-			"pulse.latency=<latency in msec> "			\
-			"[ tunnel.mode=source|sink "				\
-			"[ stream.props=<properties> ] "
+			"( pulse.latency=<latency in msec, default 200> ) "	\
+			"( tunnel.mode=source|sink, default sink ) "				\
+			"( stream.props=<properties> ) "
 
 
 static const struct spa_dict_item module_props[] = {
diff --git a/src/modules/module-raop-discover.c b/src/modules/module-raop-discover.c
index 5fdf29251..4eceb577a 100644
--- a/src/modules/module-raop-discover.c
+++ b/src/modules/module-raop-discover.c
@@ -95,7 +95,7 @@
 PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
 #define PW_LOG_TOPIC_DEFAULT mod_topic
 
-#define MODULE_USAGE "stream.rules=<rules>, use create-stream actions "
+#define MODULE_USAGE "( stream.rules=<rules>, use create-stream actions )"
 
 #define DEFAULT_CREATE_RULES	\
         "[ { matches = [ { raop.ip = \"~.*\" } ] actions = { create-stream = { } } } ] "
diff --git a/src/modules/module-raop-sink.c b/src/modules/module-raop-sink.c
index f7c2a079a..d3c2cea74 100644
--- a/src/modules/module-raop-sink.c
+++ b/src/modules/module-raop-sink.c
@@ -145,22 +145,22 @@ PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
 
 #define DEFAULT_LATENCY 22050
 
-#define MODULE_USAGE	"[ raop.ip=<ip address of host> ] "					\
-			"[ raop.port=<remote port> ] "						\
-			"[ raop.name=<name of host> ] "						\
-			"[ raop.hostname=<hostname of host> ] "					\
-			"[ raop.transport=<transport, default:udp> ] "				\
-			"[ raop.encryption.type=<encryption, default:none> ] "			\
-			"[ raop.audio.codec=PCM ] "						\
-			"[ raop.password=<password for auth> ] "				\
-			"[ node.latency=<latency as fraction> ] "				\
-			"[ node.name=<name of the nodes> ] "					\
-			"[ node.description=<description of the nodes> ] "			\
-			"[ audio.format=<format, default:"DEFAULT_FORMAT"> ] "			\
-			"[ audio.rate=<sample rate, default: "SPA_STRINGIFY(DEFAULT_RATE)"> ] "			\
-			"[ audio.channels=<number of channels, default:"SPA_STRINGIFY(DEFAULT_CHANNELS)"> ] "	\
-			"[ audio.position=<channel map, default:"DEFAULT_POSITION"> ] "		\
-			"[ stream.props=<properties> ] "
+#define MODULE_USAGE	"( raop.ip=<ip address of host> ) "					\
+			"( raop.port=<remote port> ) "						\
+			"( raop.name=<name of host> ) "						\
+			"( raop.hostname=<hostname of host> ) "					\
+			"( raop.transport=<transport, default:udp> ) "				\
+			"( raop.encryption.type=<encryption, default:none> ) "			\
+			"( raop.audio.codec=PCM ) "						\
+			"( raop.password=<password for auth> ) "				\
+			"( node.latency=<latency as fraction> ) "				\
+			"( node.name=<name of the nodes> ) "					\
+			"( node.description=<description of the nodes> ) "			\
+			"( audio.format=<format, default:"DEFAULT_FORMAT"> ) "			\
+			"( audio.rate=<sample rate, default: "SPA_STRINGIFY(DEFAULT_RATE)"> ) "			\
+			"( audio.channels=<number of channels, default:"SPA_STRINGIFY(DEFAULT_CHANNELS)"> ) "	\
+			"( audio.position=<channel map, default:"DEFAULT_POSITION"> ) "		\
+			"( stream.props=<properties> ) "
 
 
 static const struct spa_dict_item module_props[] = {
diff --git a/src/modules/module-roc-sink.c b/src/modules/module-roc-sink.c
index 43b554aff..177877e3d 100644
--- a/src/modules/module-roc-sink.c
+++ b/src/modules/module-roc-sink.c
@@ -54,7 +54,6 @@
  * context.modules = [
  *  {   name = libpipewire-module-roc-sink
  *      args = {
- *          local.ip = 0.0.0.0
  *          fec.code = disable
  *          remote.ip = 192.168.0.244
  *          remote.source.port = 10001
@@ -350,13 +349,12 @@ static int roc_sink_setup(struct module_roc_sink_data *data)
 static const struct spa_dict_item module_roc_sink_info[] = {
 	{ PW_KEY_MODULE_AUTHOR, "Sanchayan Maity <sanchayan@asymptotic.io>" },
 	{ PW_KEY_MODULE_DESCRIPTION, "roc sink" },
-	{ PW_KEY_MODULE_USAGE,	"sink.name=<name for the sink> "
-				"local.ip=<local sender ip> "
-				"fec.code=<empty>|disable|rs8m|ldpc "
+	{ PW_KEY_MODULE_USAGE,	"( sink.name=<name for the sink> ) "
+				"( fec.code=<empty>|disable|rs8m|ldpc ) "
 				"remote.ip=<remote receiver ip> "
-				"remote.source.port=<remote receiver port for source packets> "
-				"remote.repair.port=<remote receiver port for repair packets> "
-				"sink.props= { key=val ... } " },
+				"( remote.source.port=<remote receiver port for source packets> ) "
+				"( remote.repair.port=<remote receiver port for repair packets> ) "
+				"( sink.props= { key=val ... } ) " },
 	{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION },
 };
 
diff --git a/src/modules/module-roc-source.c b/src/modules/module-roc-source.c
index 1552aa8f8..a3e44d39d 100644
--- a/src/modules/module-roc-source.c
+++ b/src/modules/module-roc-source.c
@@ -371,14 +371,14 @@ static int roc_source_setup(struct module_roc_source_data *data)
 static const struct spa_dict_item module_roc_source_info[] = {
 	{ PW_KEY_MODULE_AUTHOR, "Sanchayan Maity <sanchayan@asymptotic.io>" },
 	{ PW_KEY_MODULE_DESCRIPTION, "roc source" },
-	{ PW_KEY_MODULE_USAGE,	"source.name=<name for the source> "
-				"resampler.profile=<empty>|disable|high|medium|low "
-				"fec.code=<empty>|disable|rs8m|ldpc "
-				"sess.latency.msec=<target network latency in milliseconds> "
-				"local.ip=<local receiver ip> "
-				"local.source.port=<local receiver port for source packets> "
-				"local.repair.port=<local receiver port for repair packets> "
-				"source.props= { key=value ... }" },
+	{ PW_KEY_MODULE_USAGE,	"( source.name=<name for the source> ) "
+				"( resampler.profile=<empty>|disable|high|medium|low ) "
+				"( fec.code=<empty>|disable|rs8m|ldpc ) "
+				"( sess.latency.msec=<target network latency in milliseconds> ) "
+				"( local.ip=<local receiver ip> ) "
+				"( local.source.port=<local receiver port for source packets> ) "
+				"( local.repair.port=<local receiver port for repair packets> ) "
+				"( source.props= { key=value ... } ) " },
 	{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION },
 };
 
diff --git a/src/modules/module-rt.c b/src/modules/module-rt.c
index 7b330b132..deee36eef 100644
--- a/src/modules/module-rt.c
+++ b/src/modules/module-rt.c
@@ -119,10 +119,10 @@ PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
 #define DEFAULT_RT_TIME_SOFT	-1
 #define DEFAULT_RT_TIME_HARD	-1
 
-#define MODULE_USAGE	"[nice.level=<priority: default "SPA_STRINGIFY(DEFAULT_NICE_LEVEL)"(don't change)>] "	\
-			"[rt.prio=<priority: default "SPA_STRINGIFY(DEFAULT_RT_PRIO)">] "		\
-			"[rt.time.soft=<in usec: default "SPA_STRINGIFY(DEFAULT_RT_TIME_SOFT)"] "	\
-			"[rt.time.hard=<in usec: default "SPA_STRINGIFY(DEFAULT_RT_TIME_HARD)"] "
+#define MODULE_USAGE	"( nice.level=<priority: default "SPA_STRINGIFY(DEFAULT_NICE_LEVEL)"(don't change)> ) "	\
+			"( rt.prio=<priority: default "SPA_STRINGIFY(DEFAULT_RT_PRIO)"> ) "		\
+			"( rt.time.soft=<in usec: default "SPA_STRINGIFY(DEFAULT_RT_TIME_SOFT)" ) "	\
+			"( rt.time.hard=<in usec: default "SPA_STRINGIFY(DEFAULT_RT_TIME_HARD)" ) "
 
 static const struct spa_dict_item module_props[] = {
 	{ PW_KEY_MODULE_AUTHOR, "Wim Taymans <wim.taymans@gmail.com>" },
diff --git a/src/modules/module-rtp-sap.c b/src/modules/module-rtp-sap.c
index 6d3f69965..49dbbec18 100644
--- a/src/modules/module-rtp-sap.c
+++ b/src/modules/module-rtp-sap.c
@@ -141,14 +141,14 @@ PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
 #define DEFAULT_TTL		1
 #define DEFAULT_LOOP		false
 
-#define USAGE	"local.ifname=<local interface name to use> "					\
-		"sap.ip=<SAP IP address to send announce, default:"DEFAULT_SAP_IP"> "		\
-		"sap.port=<SAP port to send on, default:"SPA_STRINGIFY(DEFAULT_SAP_PORT)"> "	\
- 		"sap.cleanup.sec=<cleanup interval in seconds, default 90> "			\
-		"source.ip=<source IP address, default:"DEFAULT_SOURCE_IP"> "			\
-		"net.ttl=<desired TTL, default:"SPA_STRINGIFY(DEFAULT_TTL)"> "			\
-		"net.loop=<desired loopback, default:"SPA_STRINGIFY(DEFAULT_LOOP)"> "		\
-		"stream.rules=<rules>, use announce-stream and create-stream actions "
+#define USAGE	"( local.ifname=<local interface name to use> ) "					\
+		"( sap.ip=<SAP IP address to send announce, default:"DEFAULT_SAP_IP"> ) "		\
+		"( sap.port=<SAP port to send on, default:"SPA_STRINGIFY(DEFAULT_SAP_PORT)"> ) "	\
+ 		"( sap.cleanup.sec=<cleanup interval in seconds, default 90> ) "			\
+		"( source.ip=<source IP address, default:"DEFAULT_SOURCE_IP"> ) "			\
+		"( net.ttl=<desired TTL, default:"SPA_STRINGIFY(DEFAULT_TTL)"> ) "			\
+		"( net.loop=<desired loopback, default:"SPA_STRINGIFY(DEFAULT_LOOP)"> ) "		\
+		"( stream.rules=<rules>, use announce-stream and create-stream actions )"
 
 static const struct spa_dict_item module_info[] = {
 	{ PW_KEY_MODULE_AUTHOR, "Wim Taymans <wim.taymans@gmail.com>" },
diff --git a/src/modules/module-rtp-session.c b/src/modules/module-rtp-session.c
index b4e64ff6a..bd8a80e2d 100644
--- a/src/modules/module-rtp-session.c
+++ b/src/modules/module-rtp-session.c
@@ -128,21 +128,21 @@ PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
 #define DEFAULT_TTL		1
 #define DEFAULT_LOOP		false
 
-#define USAGE	"control.ip=<destination IP address, default:"DEFAULT_CONTROL_IP"> "	\
-		"control.port=<int, default:"SPA_STRINGIFY(DEFAULT_CONTROL_PORT)"> "		\
-		"local.ifname=<local interface name to use> "					\
-		"net.mtu=<desired MTU, default:"SPA_STRINGIFY(DEFAULT_MTU)"> "			\
-		"net.ttl=<desired TTL, default:"SPA_STRINGIFY(DEFAULT_TTL)"> "			\
-		"net.loop=<desired loopback, default:"SPA_STRINGIFY(DEFAULT_LOOP)"> "		\
-		"sess.name=<a name for the session> "						\
-		"sess.min-ptime=<minimum packet time in milliseconds, default:2> "		\
-		"sess.max-ptime=<maximum packet time in milliseconds, default:20> "		\
-		"sess.media=<string, the media type audio|midi|opus, default audio> "		\
-		"audio.format=<format, default:"DEFAULT_FORMAT"> "				\
-		"audio.rate=<sample rate, default:"SPA_STRINGIFY(DEFAULT_RATE)"> "		\
-		"audio.channels=<number of channels, default:"SPA_STRINGIFY(DEFAULT_CHANNELS)"> "\
-		"audio.position=<channel map, default:"DEFAULT_POSITION"> "			\
-		"stream.props= { key=value ... }"
+#define USAGE	"( control.ip=<destination IP address, default:"DEFAULT_CONTROL_IP"> ) "	\
+		"( control.port=<int, default:"SPA_STRINGIFY(DEFAULT_CONTROL_PORT)"> ) "	\
+		"( local.ifname=<local interface name to use> ) "				\
+		"( net.mtu=<desired MTU, default:"SPA_STRINGIFY(DEFAULT_MTU)"> ) "		\
+		"( net.ttl=<desired TTL, default:"SPA_STRINGIFY(DEFAULT_TTL)"> ) "		\
+		"( net.loop=<desired loopback, default:"SPA_STRINGIFY(DEFAULT_LOOP)"> ) "	\
+		"( sess.name=<a name for the session> ) "					\
+		"( sess.min-ptime=<minimum packet time in milliseconds, default:2> ) "		\
+		"( sess.max-ptime=<maximum packet time in milliseconds, default:20> ) "		\
+		"( sess.media=<string, the media type audio|midi|opus, default audio> ) "	\
+		"( audio.format=<format, default:"DEFAULT_FORMAT"> ) "				\
+		"( audio.rate=<sample rate, default:"SPA_STRINGIFY(DEFAULT_RATE)"> ) "		\
+		"( audio.channels=<number of channels, default:"SPA_STRINGIFY(DEFAULT_CHANNELS)"> ) "\
+		"( audio.position=<channel map, default:"DEFAULT_POSITION"> ) "			\
+		"( stream.props= { key=value ... } ) "
 
 static const struct spa_dict_item module_info[] = {
 	{ PW_KEY_MODULE_AUTHOR, "Wim Taymans <wim.taymans@gmail.com>" },
diff --git a/src/modules/module-rtp-sink.c b/src/modules/module-rtp-sink.c
index ccf733094..eea70aaae 100644
--- a/src/modules/module-rtp-sink.c
+++ b/src/modules/module-rtp-sink.c
@@ -118,23 +118,23 @@ PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
 
 #define DEFAULT_TS_OFFSET	-1
 
-#define USAGE	"source.ip=<source IP address, default:"DEFAULT_SOURCE_IP"> "			\
-		"destination.ip=<destination IP address, default:"DEFAULT_DESTINATION_IP"> "	\
- 		"destination.port=<int, default random beteen 46000 and 47024> "		\
-		"local.ifname=<local interface name to use> "					\
-		"net.mtu=<desired MTU, default:"SPA_STRINGIFY(DEFAULT_MTU)"> "			\
-		"net.ttl=<desired TTL, default:"SPA_STRINGIFY(DEFAULT_TTL)"> "			\
-		"net.loop=<desired loopback, default:"SPA_STRINGIFY(DEFAULT_LOOP)"> "		\
-		"net.dscp=<desired DSCP, default:"SPA_STRINGIFY(DEFAULT_DSCP)"> "		\
-		"sess.name=<a name for the session> "						\
-		"sess.min-ptime=<minimum packet time in milliseconds, default:2> "		\
-		"sess.max-ptime=<maximum packet time in milliseconds, default:20> "		\
- 		"sess.media=<string, the media type audio|midi, default audio> "		\
-		"audio.format=<format, default:"DEFAULT_FORMAT"> "				\
-		"audio.rate=<sample rate, default:"SPA_STRINGIFY(DEFAULT_RATE)"> "		\
-		"audio.channels=<number of channels, default:"SPA_STRINGIFY(DEFAULT_CHANNELS)"> "\
-		"audio.position=<channel map, default:"DEFAULT_POSITION"> "			\
-		"stream.props= { key=value ... }"
+#define USAGE	"( source.ip=<source IP address, default:"DEFAULT_SOURCE_IP"> ) "			\
+		"( destination.ip=<destination IP address, default:"DEFAULT_DESTINATION_IP"> ) "	\
+ 		"( destination.port=<int, default random beteen 46000 and 47024> ) "			\
+		"( local.ifname=<local interface name to use> ) "					\
+		"( net.mtu=<desired MTU, default:"SPA_STRINGIFY(DEFAULT_MTU)"> ) "			\
+		"( net.ttl=<desired TTL, default:"SPA_STRINGIFY(DEFAULT_TTL)"> ) "			\
+		"( net.loop=<desired loopback, default:"SPA_STRINGIFY(DEFAULT_LOOP)"> ) "		\
+		"( net.dscp=<desired DSCP, default:"SPA_STRINGIFY(DEFAULT_DSCP)"> ) "			\
+		"( sess.name=<a name for the session> ) "						\
+		"( sess.min-ptime=<minimum packet time in milliseconds, default:2> ) "			\
+		"( sess.max-ptime=<maximum packet time in milliseconds, default:20> ) "			\
+ 		"( sess.media=<string, the media type audio|midi, default audio> ) "			\
+		"( audio.format=<format, default:"DEFAULT_FORMAT"> ) "					\
+		"( audio.rate=<sample rate, default:"SPA_STRINGIFY(DEFAULT_RATE)"> ) "			\
+		"( audio.channels=<number of channels, default:"SPA_STRINGIFY(DEFAULT_CHANNELS)"> ) "	\
+		"( audio.position=<channel map, default:"DEFAULT_POSITION"> ) "				\
+		"( stream.props= { key=value ... } ) "
 
 static const struct spa_dict_item module_info[] = {
 	{ PW_KEY_MODULE_AUTHOR, "Wim Taymans <wim.taymans@gmail.com>" },
diff --git a/src/modules/module-rtp-source.c b/src/modules/module-rtp-source.c
index fc9ba4501..56bc14290 100644
--- a/src/modules/module-rtp-source.c
+++ b/src/modules/module-rtp-source.c
@@ -101,16 +101,16 @@ PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
 
 #define DEFAULT_TS_OFFSET		-1
 
-#define USAGE   "local.ifname=<local interface name to use> "						\
-		"source.ip=<source IP address, default:"DEFAULT_SOURCE_IP"> "				\
- 		"source.port=<int, source port> "							\
-		"sess.latency.msec=<target network latency, default "SPA_STRINGIFY(DEFAULT_SESS_LATENCY)"> "	\
- 		"sess.media=<string, the media type audio|midi, default audio> "		\
-		"audio.format=<format, default:"DEFAULT_FORMAT"> "				\
-		"audio.rate=<sample rate, default:"SPA_STRINGIFY(DEFAULT_RATE)"> "		\
-		"audio.channels=<number of channels, default:"SPA_STRINGIFY(DEFAULT_CHANNELS)"> "\
-		"audio.position=<channel map, default:"DEFAULT_POSITION"> "			\
-		"stream.props= { key=value ... } "
+#define USAGE   "( local.ifname=<local interface name to use> ) "						\
+		"( source.ip=<source IP address, default:"DEFAULT_SOURCE_IP"> ) "				\
+ 		"source.port=<int, source port> "								\
+		"( sess.latency.msec=<target network latency, default "SPA_STRINGIFY(DEFAULT_SESS_LATENCY)"> ) "	\
+ 		"( sess.media=<string, the media type audio|midi, default audio> ) "				\
+		"( audio.format=<format, default:"DEFAULT_FORMAT"> ) "						\
+		"( audio.rate=<sample rate, default:"SPA_STRINGIFY(DEFAULT_RATE)"> ) "				\
+		"( audio.channels=<number of channels, default:"SPA_STRINGIFY(DEFAULT_CHANNELS)"> ) "		\
+		"( audio.position=<channel map, default:"DEFAULT_POSITION"> ) "					\
+		"( stream.props= { key=value ... } ) "
 
 static const struct spa_dict_item module_info[] = {
 	{ PW_KEY_MODULE_AUTHOR, "Wim Taymans <wim.taymans@gmail.com>" },
diff --git a/src/modules/module-x11-bell.c b/src/modules/module-x11-bell.c
index 70d577946..988fb92b7 100644
--- a/src/modules/module-x11-bell.c
+++ b/src/modules/module-x11-bell.c
@@ -230,10 +230,10 @@ static const struct pw_impl_module_events module_events = {
 static const struct spa_dict_item module_x11_bell_info[] = {
 	{ PW_KEY_MODULE_AUTHOR, "Wim Taymans <wim.taymans@gmail.com>" },
 	{ PW_KEY_MODULE_DESCRIPTION, "X11 Bell interceptor" },
-	{ PW_KEY_MODULE_USAGE,	"sink.name=<name for the sink> "
-				"sample.name=<the sample name> "
-				"x11.display=<the X11 display> "
-				"x11.xauthority=<the X11 XAuthority> " },
+	{ PW_KEY_MODULE_USAGE,	"( sink.name=<name for the sink> ) "
+				"( sample.name=<the sample name> ) "
+				"( x11.display=<the X11 display> ) "
+				".x11.xauthority=<the X11 XAuthority> )" },
 	{ PW_KEY_MODULE_VERSION, PACKAGE_VERSION },
 };
 SPA_EXPORT
diff --git a/src/modules/module-zeroconf-discover.c b/src/modules/module-zeroconf-discover.c
index ae390ec7b..7ffd65b99 100644
--- a/src/modules/module-zeroconf-discover.c
+++ b/src/modules/module-zeroconf-discover.c
@@ -55,7 +55,7 @@
 PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
 #define PW_LOG_TOPIC_DEFAULT mod_topic
 
-#define MODULE_USAGE	"pulse.latency=<latency in msec> "
+#define MODULE_USAGE	"( pulse.latency=<latency in msec, default 200> ) "
 
 static const struct spa_dict_item module_props[] = {
 	{ PW_KEY_MODULE_AUTHOR, "Wim Taymans <wim.taymans@gmail.com>" },