| Message ID | 20230506163735.3481387-4-marcandre.lureau@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | audio: pipewire backend improvements | expand |
> From: Marc-André Lureau <marcandre.lureau@redhat.com> > > "PipeWire" is the correct case. > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > meson.build | 2 +- > qapi/audio.json | 12 ++++++------ > audio/pwaudio.c | 10 +++++----- > audio/trace-events | 2 +- > meson_options.txt | 2 +- > qemu-options.hx | 4 ++-- > scripts/meson-buildoptions.sh | 2 +- > 7 files changed, 17 insertions(+), 17 deletions(-) Reviewed-by: Volker Rümelin <vr_qemu@t-online.de> > diff --git a/meson.build b/meson.build > index 229eb585f7..4c44736bd4 100644 > --- a/meson.build > +++ b/meson.build > @@ -3988,7 +3988,7 @@ if targetos == 'linux' > summary_info += {'ALSA support': alsa} > summary_info += {'PulseAudio support': pulse} > endif > -summary_info += {'Pipewire support': pipewire} > +summary_info += {'PipeWire support': pipewire} > summary_info += {'JACK support': jack} > summary_info += {'brlapi support': brlapi} > summary_info += {'vde support': vde} > diff --git a/qapi/audio.json b/qapi/audio.json > index e03396a7bc..b5c1af2b91 100644 > --- a/qapi/audio.json > +++ b/qapi/audio.json > @@ -327,17 +327,17 @@ > ## > # @AudiodevPipewirePerDirectionOptions: > # > -# Options of the Pipewire backend that are used for both playback and > +# Options of the PipeWire backend that are used for both playback and > # recording. > # > # @name: name of the sink/source to use > # > -# @stream-name: name of the Pipewire stream created by qemu. Can be > -# used to identify the stream in Pipewire when you > -# create multiple Pipewire devices or run multiple qemu > +# @stream-name: name of the PipeWire stream created by qemu. Can be > +# used to identify the stream in PipeWire when you > +# create multiple PipeWire devices or run multiple qemu > # instances (default: audiodev's id) > # > -# @latency: latency you want Pipewire to achieve in microseconds > +# @latency: latency you want PipeWire to achieve in microseconds > # (default 46000) > # > # Since: 8.1 > @@ -352,7 +352,7 @@ > ## > # @AudiodevPipewireOptions: > # > -# Options of the Pipewire audio backend. > +# Options of the PipeWire audio backend. > # > # @in: options of the capture stream > # > diff --git a/audio/pwaudio.c b/audio/pwaudio.c > index 1d108bdebb..9eb69bfd18 100644 > --- a/audio/pwaudio.c > +++ b/audio/pwaudio.c > @@ -1,5 +1,5 @@ > /* > - * QEMU Pipewire audio driver > + * QEMU PipeWire audio driver > * > * Copyright (c) 2023 Red Hat Inc. > * > @@ -800,21 +800,21 @@ qpw_audio_init(Audiodev *dev) > assert(dev->driver == AUDIODEV_DRIVER_PIPEWIRE); > > pw->dev = dev; > - pw->thread_loop = pw_thread_loop_new("Pipewire thread loop", NULL); > + pw->thread_loop = pw_thread_loop_new("PipeWire thread loop", NULL); > if (pw->thread_loop == NULL) { > - error_report("Could not create Pipewire loop"); > + error_report("Could not create PipeWire loop"); > goto fail; > } > > pw->context = > pw_context_new(pw_thread_loop_get_loop(pw->thread_loop), NULL, 0); > if (pw->context == NULL) { > - error_report("Could not create Pipewire context"); > + error_report("Could not create PipeWire context"); > goto fail; > } > > if (pw_thread_loop_start(pw->thread_loop) < 0) { > - error_report("Could not start Pipewire loop"); > + error_report("Could not start PipeWire loop"); > goto fail; > } > > diff --git a/audio/trace-events b/audio/trace-events > index 85dbb506b2..ab04f020ce 100644 > --- a/audio/trace-events > +++ b/audio/trace-events > @@ -24,7 +24,7 @@ pw_read(int32_t avail, uint32_t index, size_t len) "avail=%d index=%u len=%zu" > pw_write(int32_t filled, int32_t avail, uint32_t index, size_t len) "filled=%d avail=%d index=%u len=%zu" > pw_vol(const char *ret) "set volume: %s" > pw_period(uint64_t quantum, uint32_t rate) "period =%" PRIu64 "/%u" > -pw_audio_init(void) "Initialize Pipewire context" > +pw_audio_init(void) "Initialize PipeWire context" > > # audio.c > audio_timer_start(int interval) "interval %d ms" > diff --git a/meson_options.txt b/meson_options.txt > index ae2017702a..8dd786c1a4 100644 > --- a/meson_options.txt > +++ b/meson_options.txt > @@ -256,7 +256,7 @@ option('oss', type: 'feature', value: 'auto', > option('pa', type: 'feature', value: 'auto', > description: 'PulseAudio sound support') > option('pipewire', type: 'feature', value: 'auto', > - description: 'Pipewire sound support') > + description: 'PipeWire sound support') > option('sndio', type: 'feature', value: 'auto', > description: 'sndio sound support') > > diff --git a/qemu-options.hx b/qemu-options.hx > index 42b9094c10..be7317d455 100644 > --- a/qemu-options.hx > +++ b/qemu-options.hx > @@ -963,10 +963,10 @@ SRST > to honor this value but actual latencies may be lower or higher. > > ``-audiodev pipewire,id=id[,prop[=value][,...]]`` > - Creates a backend using Pipewire. This backend is available on > + Creates a backend using PipeWire. This backend is available on > most systems. > > - Pipewire specific options are: > + PipeWire specific options are: > > ``in|out.latency=usecs`` > Desired latency in microseconds. > diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh > index 0e888e6ecd..ba697207f4 100644 > --- a/scripts/meson-buildoptions.sh > +++ b/scripts/meson-buildoptions.sh > @@ -137,7 +137,7 @@ meson_options_help() { > printf "%s\n" ' oss OSS sound support' > printf "%s\n" ' pa PulseAudio sound support' > printf "%s\n" ' parallels parallels image format support' > - printf "%s\n" ' pipewire Pipewire sound support' > + printf "%s\n" ' pipewire PipeWire sound support' > printf "%s\n" ' png PNG support with libpng' > printf "%s\n" ' pvrdma Enable PVRDMA support' > printf "%s\n" ' qcow1 qcow1 image format support'
On 6/5/23 18:37, marcandre.lureau@redhat.com wrote: > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > "PipeWire" is the correct case. > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > meson.build | 2 +- > qapi/audio.json | 12 ++++++------ > audio/pwaudio.c | 10 +++++----- > audio/trace-events | 2 +- > meson_options.txt | 2 +- > qemu-options.hx | 4 ++-- > scripts/meson-buildoptions.sh | 2 +- > 7 files changed, 17 insertions(+), 17 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
diff --git a/meson.build b/meson.build index 229eb585f7..4c44736bd4 100644 --- a/meson.build +++ b/meson.build @@ -3988,7 +3988,7 @@ if targetos == 'linux' summary_info += {'ALSA support': alsa} summary_info += {'PulseAudio support': pulse} endif -summary_info += {'Pipewire support': pipewire} +summary_info += {'PipeWire support': pipewire} summary_info += {'JACK support': jack} summary_info += {'brlapi support': brlapi} summary_info += {'vde support': vde} diff --git a/qapi/audio.json b/qapi/audio.json index e03396a7bc..b5c1af2b91 100644 --- a/qapi/audio.json +++ b/qapi/audio.json @@ -327,17 +327,17 @@ ## # @AudiodevPipewirePerDirectionOptions: # -# Options of the Pipewire backend that are used for both playback and +# Options of the PipeWire backend that are used for both playback and # recording. # # @name: name of the sink/source to use # -# @stream-name: name of the Pipewire stream created by qemu. Can be -# used to identify the stream in Pipewire when you -# create multiple Pipewire devices or run multiple qemu +# @stream-name: name of the PipeWire stream created by qemu. Can be +# used to identify the stream in PipeWire when you +# create multiple PipeWire devices or run multiple qemu # instances (default: audiodev's id) # -# @latency: latency you want Pipewire to achieve in microseconds +# @latency: latency you want PipeWire to achieve in microseconds # (default 46000) # # Since: 8.1 @@ -352,7 +352,7 @@ ## # @AudiodevPipewireOptions: # -# Options of the Pipewire audio backend. +# Options of the PipeWire audio backend. # # @in: options of the capture stream # diff --git a/audio/pwaudio.c b/audio/pwaudio.c index 1d108bdebb..9eb69bfd18 100644 --- a/audio/pwaudio.c +++ b/audio/pwaudio.c @@ -1,5 +1,5 @@ /* - * QEMU Pipewire audio driver + * QEMU PipeWire audio driver * * Copyright (c) 2023 Red Hat Inc. * @@ -800,21 +800,21 @@ qpw_audio_init(Audiodev *dev) assert(dev->driver == AUDIODEV_DRIVER_PIPEWIRE); pw->dev = dev; - pw->thread_loop = pw_thread_loop_new("Pipewire thread loop", NULL); + pw->thread_loop = pw_thread_loop_new("PipeWire thread loop", NULL); if (pw->thread_loop == NULL) { - error_report("Could not create Pipewire loop"); + error_report("Could not create PipeWire loop"); goto fail; } pw->context = pw_context_new(pw_thread_loop_get_loop(pw->thread_loop), NULL, 0); if (pw->context == NULL) { - error_report("Could not create Pipewire context"); + error_report("Could not create PipeWire context"); goto fail; } if (pw_thread_loop_start(pw->thread_loop) < 0) { - error_report("Could not start Pipewire loop"); + error_report("Could not start PipeWire loop"); goto fail; } diff --git a/audio/trace-events b/audio/trace-events index 85dbb506b2..ab04f020ce 100644 --- a/audio/trace-events +++ b/audio/trace-events @@ -24,7 +24,7 @@ pw_read(int32_t avail, uint32_t index, size_t len) "avail=%d index=%u len=%zu" pw_write(int32_t filled, int32_t avail, uint32_t index, size_t len) "filled=%d avail=%d index=%u len=%zu" pw_vol(const char *ret) "set volume: %s" pw_period(uint64_t quantum, uint32_t rate) "period =%" PRIu64 "/%u" -pw_audio_init(void) "Initialize Pipewire context" +pw_audio_init(void) "Initialize PipeWire context" # audio.c audio_timer_start(int interval) "interval %d ms" diff --git a/meson_options.txt b/meson_options.txt index ae2017702a..8dd786c1a4 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -256,7 +256,7 @@ option('oss', type: 'feature', value: 'auto', option('pa', type: 'feature', value: 'auto', description: 'PulseAudio sound support') option('pipewire', type: 'feature', value: 'auto', - description: 'Pipewire sound support') + description: 'PipeWire sound support') option('sndio', type: 'feature', value: 'auto', description: 'sndio sound support') diff --git a/qemu-options.hx b/qemu-options.hx index 42b9094c10..be7317d455 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -963,10 +963,10 @@ SRST to honor this value but actual latencies may be lower or higher. ``-audiodev pipewire,id=id[,prop[=value][,...]]`` - Creates a backend using Pipewire. This backend is available on + Creates a backend using PipeWire. This backend is available on most systems. - Pipewire specific options are: + PipeWire specific options are: ``in|out.latency=usecs`` Desired latency in microseconds. diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index 0e888e6ecd..ba697207f4 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -137,7 +137,7 @@ meson_options_help() { printf "%s\n" ' oss OSS sound support' printf "%s\n" ' pa PulseAudio sound support' printf "%s\n" ' parallels parallels image format support' - printf "%s\n" ' pipewire Pipewire sound support' + printf "%s\n" ' pipewire PipeWire sound support' printf "%s\n" ' png PNG support with libpng' printf "%s\n" ' pvrdma Enable PVRDMA support' printf "%s\n" ' qcow1 qcow1 image format support'