[pulseaudio-commits] src/modules src/pulse src/pulsecore
Tanu Kaskinen
tanuk at kemper.freedesktop.org
Fri Mar 7 08:04:03 PST 2014
src/modules/bluetooth/bluez5-util.c | 2 +-
src/modules/module-device-manager.c | 4 ++--
src/modules/module-stream-restore.c | 4 ++--
src/pulse/proplist.h | 2 +-
src/pulsecore/sink.c | 2 +-
src/pulsecore/source.c | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 305409cfcf3902fa78896589229cd31f6788afa9
Author: Alexander E. Patrakov <patrakov at gmail.com>
Date: Fri Mar 7 21:26:28 2014 +0600
Fix a few "it's -> its" typos
diff --git a/src/modules/bluetooth/bluez5-util.c b/src/modules/bluetooth/bluez5-util.c
index 7eecc18..4d1111d 100644
--- a/src/modules/bluetooth/bluez5-util.c
+++ b/src/modules/bluetooth/bluez5-util.c
@@ -1233,7 +1233,7 @@ static DBusMessage *endpoint_set_configuration(DBusConnection *conn, DBusMessage
goto fail2;
}
} else {
- /* InterfacesAdded signal is probably on it's way, device_info_valid is kept as 0. */
+ /* InterfacesAdded signal is probably on its way, device_info_valid is kept as 0. */
pa_log_warn("SetConfiguration() received for unknown device %s", dev_path);
d = device_create(y, dev_path);
}
diff --git a/src/modules/module-device-manager.c b/src/modules/module-device-manager.c
index d86c158..9621f3e 100644
--- a/src/modules/module-device-manager.c
+++ b/src/modules/module-device-manager.c
@@ -502,7 +502,7 @@ static inline struct entry *load_or_initialize_entry(struct userdata *u, struct
entry->description = pa_xstrdup(old->description);
entry->icon = pa_xstrdup(old->icon);
} else {
- /* This is a new device, so make sure we write it's priority list correctly */
+ /* This is a new device, so make sure we write its priority list correctly */
role_indexes_t max_priority;
pa_datum key;
bool done;
@@ -1328,7 +1328,7 @@ static int extension_cb(pa_native_protocol *p, pa_module *m, pa_native_connectio
}
pa_hashmap_free(h);
- pa_log_error("Client specified an unknown device in it's reorder list.");
+ pa_log_error("Client specified an unknown device in its reorder list.");
goto fail;
}
entry_free(e);
diff --git a/src/modules/module-stream-restore.c b/src/modules/module-stream-restore.c
index 9689e79..5a4bce7 100644
--- a/src/modules/module-stream-restore.c
+++ b/src/modules/module-stream-restore.c
@@ -1912,7 +1912,7 @@ static void entry_apply(struct userdata *u, const char *name, struct entry *e) {
removed the sink element from the rule. */
si->save_sink = false;
/* This is cheating a bit. The sink input itself has not changed
- but the rules governing it's routing have, so we fire this event
+ but the rules governing its routing have, so we fire this event
such that other routing modules (e.g. module-device-manager)
will pick up the change and reapply their routing */
pa_subscription_post(si->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_CHANGE, si->index);
@@ -1960,7 +1960,7 @@ static void entry_apply(struct userdata *u, const char *name, struct entry *e) {
removed the source element from the rule. */
so->save_source = false;
/* This is cheating a bit. The source output itself has not changed
- but the rules governing it's routing have, so we fire this event
+ but the rules governing its routing have, so we fire this event
such that other routing modules (e.g. module-device-manager)
will pick up the change and reapply their routing */
pa_subscription_post(so->core, PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT|PA_SUBSCRIPTION_EVENT_CHANGE, so->index);
diff --git a/src/pulse/proplist.h b/src/pulse/proplist.h
index dc3cddc..e55a479 100644
--- a/src/pulse/proplist.h
+++ b/src/pulse/proplist.h
@@ -71,7 +71,7 @@ PA_C_DECL_BEGIN
/** For streams: the name of a filter that is desired, e.g.\ "echo-cancel" or "equalizer-sink". Differs from PA_PROP_FILTER_WANT in that it forces PulseAudio to apply the filter, regardless of whether PulseAudio thinks it makes sense to do so or not. If this is set, PA_PROP_FILTER_WANT is ignored. In other words, you almost certainly do not want to use this. \since 1.0 */
#define PA_PROP_FILTER_APPLY "filter.apply"
-/** For streams: the name of a filter that should specifically suppressed (i.e.\ overrides PA_PROP_FILTER_WANT). Useful for the times that PA_PROP_FILTER_WANT is automatically added (e.g. echo-cancellation for phone streams when $VOIP_APP does it's own, internal AEC) \since 1.0 */
+/** For streams: the name of a filter that should specifically suppressed (i.e.\ overrides PA_PROP_FILTER_WANT). Useful for the times that PA_PROP_FILTER_WANT is automatically added (e.g. echo-cancellation for phone streams when $VOIP_APP does its own, internal AEC) \since 1.0 */
#define PA_PROP_FILTER_SUPPRESS "filter.suppress"
/** For event sound streams: XDG event sound name. e.g.\ "message-new-email" (Event sound streams are those with media.role set to "event") */
diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
index f4647b8..47ee0aa 100644
--- a/src/pulsecore/sink.c
+++ b/src/pulsecore/sink.c
@@ -2056,7 +2056,7 @@ void pa_sink_set_volume(
/* Let's 'push' the reference volume if necessary */
pa_cvolume_merge(&new_reference_volume, &s->reference_volume, &root_sink->real_volume);
- /* If the sink and it's root don't have the same number of channels, we need to remap */
+ /* If the sink and its root don't have the same number of channels, we need to remap */
if (s != root_sink && !pa_channel_map_equal(&s->channel_map, &root_sink->channel_map))
pa_cvolume_remap(&new_reference_volume, &s->channel_map, &root_sink->channel_map);
update_reference_volume(root_sink, &new_reference_volume, &root_sink->channel_map, save);
diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c
index af4c6ec..853bb6c 100644
--- a/src/pulsecore/source.c
+++ b/src/pulsecore/source.c
@@ -1651,7 +1651,7 @@ void pa_source_set_volume(
/* Let's 'push' the reference volume if necessary */
pa_cvolume_merge(&new_reference_volume, &s->reference_volume, &root_source->real_volume);
- /* If the source and it's root don't have the same number of channels, we need to remap */
+ /* If the source and its root don't have the same number of channels, we need to remap */
if (s != root_source && !pa_channel_map_equal(&s->channel_map, &root_source->channel_map))
pa_cvolume_remap(&new_reference_volume, &s->channel_map, &root_source->channel_map);
update_reference_volume(root_source, &new_reference_volume, &root_source->channel_map, save);
More information about the pulseaudio-commits
mailing list