Skip to content

Commit

Permalink
audio/pw: Pipewire->PipeWire case fix for user-visible text
Browse files Browse the repository at this point in the history
"PipeWire" is the correct case.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Volker Rümelin <vr_qemu@t-online.de>
Message-Id: <20230506163735.3481387-4-marcandre.lureau@redhat.com>
  • Loading branch information
elmarco committed Jul 17, 2023
1 parent 62259d8 commit 20c5124
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 17 deletions.
10 changes: 5 additions & 5 deletions audio/pwaudio.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* QEMU Pipewire audio driver
* QEMU PipeWire audio driver
*
* Copyright (c) 2023 Red Hat Inc.
*
Expand Down Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion audio/trace-events
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -4251,7 +4251,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(summary_info, bool_yn: true, section: 'Audio backends')

Expand Down
2 changes: 1 addition & 1 deletion meson_options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,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')

Expand Down
12 changes: 6 additions & 6 deletions qapi/audio.json
Original file line number Diff line number Diff line change
Expand Up @@ -328,17 +328,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 instances (default:
# @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
Expand All @@ -353,7 +353,7 @@
##
# @AudiodevPipewireOptions:
#
# Options of the Pipewire audio backend.
# Options of the PipeWire audio backend.
#
# @in: options of the capture stream
#
Expand Down
4 changes: 2 additions & 2 deletions qemu-options.hx
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion scripts/meson-buildoptions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,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'
Expand Down

0 comments on commit 20c5124

Please sign in to comment.