diff --git a/src/daemon/pipewire-pulse.c b/src/daemon/pipewire-pulse.c index 6218b3681..52f7fbf48 100644 --- a/src/daemon/pipewire-pulse.c +++ b/src/daemon/pipewire-pulse.c @@ -45,7 +45,9 @@ static void show_help(const char *name) "Start a pulseaudio compatible daemon.\n\n" " -h, --help Show this help\n" " --version Show version\n" - " -a --address comma separated list of addresses (Default %s)\n", + " -a --address comma separated list of addresses (Default %s)\n" + " unix:\n", + " tcp:[][:]\n", name, address); } diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in index 0a9944dfd..6cb3c9c79 100644 --- a/src/daemon/pipewire.conf.in +++ b/src/daemon/pipewire.conf.in @@ -71,8 +71,20 @@ create-object spa-node-factory factory.name=support.node.driver node.name=Dummy ## exec # -# Execute the given program. This is usually used to start the -# session manager. run the session manager with -h for options +# Execute the given program. +# +# Start the session manager. Run the session manager with -h for +# options. +# +# The bluetooth module is disabled by default because it causes +# conflicts with PulseAudio. If you disable PulseAudio or don't +# load its bluetooth module, you can enable it here with -e bluez5 +# +exec @media_session_path@ +# +# You can optionally start the pulseaudio-server here as well +# but it better to start it as a systemd service. +# It can be interesting to start another daemon here that listens +# on another address with the -a option (eg. -a tcp:4713) # -exec @media_session_path@ # -d alsa-seq,alsa-pcm,bluez5,metadata #exec @pipewire_pulse_path@ diff --git a/src/examples/media-session/media-session.c b/src/examples/media-session/media-session.c index d42fb6bcd..c437a918f 100644 --- a/src/examples/media-session/media-session.c +++ b/src/examples/media-session/media-session.c @@ -2133,8 +2133,8 @@ static void show_help(const char *name, const char *enabled, const char *disable fprintf(stdout, "%s [options]\n" " -h, --help Show this help\n" " --version Show version\n" - " -e, --enabled Extra enabled options ('%s')\n" - " -d, --disabled Extra disabled options ('%s')\n" + " -e, --enabled Extra comma separated enabled options ('%s')\n" + " -d, --disabled Extra comma separated disabled options ('%s')\n" " -p, --properties Extra properties as 'key=value { key=value }'\n", name, enabled, disabled);