This patch looks broken: Profile availability is not a boolean, it's a
tristate (yes/no/unkown).
On 2015-03-19 12:51, Juho Hämäläinen wrote:
> ---
>
> Noticed that profile availability was missing from D-Bus API so added while
> at it. Didn't check whether there was other stuff missing elsewhere as well.
>
>
> src/modules/dbus/iface-card-profile.c | 19 +++++++++++++
> src/modules/dbus/iface-card.c | 51 ++++++++++++++++++++++++++++++-----
> 2 files changed, 64 insertions(+), 6 deletions(-)
>
> diff --git a/src/modules/dbus/iface-card-profile.c b/src/modules/dbus/iface-card-profile.c
> index e39c24d..f8ae846 100644
> --- a/src/modules/dbus/iface-card-profile.c
> +++ b/src/modules/dbus/iface-card-profile.c
> @@ -36,6 +36,7 @@ static void handle_get_description(DBusConnection *conn, DBusMessage *msg, void
> static void handle_get_sinks(DBusConnection *conn, DBusMessage *msg, void *userdata);
> static void handle_get_sources(DBusConnection *conn, DBusMessage *msg, void *userdata);
> static void handle_get_priority(DBusConnection *conn, DBusMessage *msg, void *userdata);
> +static void handle_get_available(DBusConnection *conn, DBusMessage *msg, void *userdata);
>
> static void handle_get_all(DBusConnection *conn, DBusMessage *msg, void *userdata);
>
> @@ -53,6 +54,7 @@ enum property_handler_index {
> PROPERTY_HANDLER_SINKS,
> PROPERTY_HANDLER_SOURCES,
> PROPERTY_HANDLER_PRIORITY,
> + PROPERTY_HANDLER_AVAILABLE,
> PROPERTY_HANDLER_MAX
> };
>
> @@ -63,6 +65,7 @@ static pa_dbus_property_handler property_handlers[PROPERTY_HANDLER_MAX] = {
> [PROPERTY_HANDLER_SINKS] = { .property_name = "Sinks", .type = "u", .get_cb = handle_get_sinks, .set_cb = NULL },
> [PROPERTY_HANDLER_SOURCES] = { .property_name = "Sources", .type = "u", .get_cb = handle_get_sources, .set_cb = NULL },
> [PROPERTY_HANDLER_PRIORITY] = { .property_name = "Priority", .type = "u", .get_cb = handle_get_priority, .set_cb = NULL },
> + [PROPERTY_HANDLER_AVAILABLE] = { .property_name = "Available", .type = "b", .get_cb = handle_get_available, .set_cb = NULL },
> };
>
> static pa_dbus_interface_info profile_interface_info = {
> @@ -145,6 +148,19 @@ static void handle_get_priority(DBusConnection *conn, DBusMessage *msg, void *us
> pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_UINT32, &priority);
> }
>
> +static void handle_get_available(DBusConnection *conn, DBusMessage *msg, void *userdata) {
> + pa_dbusiface_card_profile *p = userdata;
> + dbus_bool_t available;
> +
> + pa_assert(conn);
> + pa_assert(msg);
> + pa_assert(p);
> +
> + available = p->profile->available;
> +
> + pa_dbus_send_basic_variant_reply(conn, msg, DBUS_TYPE_BOOLEAN, &available);
> +}
> +
> static void handle_get_all(DBusConnection *conn, DBusMessage *msg, void *userdata) {
> pa_dbusiface_card_profile *p = userdata;
> DBusMessage *reply = NULL;
> @@ -153,6 +169,7 @@ static void handle_get_all(DBusConnection *conn, DBusMessage *msg, void *userdat
> dbus_uint32_t sinks = 0;
> dbus_uint32_t sources = 0;
> dbus_uint32_t priority = 0;
> + dbus_bool_t available;
>
> pa_assert(conn);
> pa_assert(msg);
> @@ -161,6 +178,7 @@ static void handle_get_all(DBusConnection *conn, DBusMessage *msg, void *userdat
> sinks = p->profile->n_sinks;
> sources = p->profile->n_sources;
> priority = p->profile->priority;
> + available = p->profile->available;
>
> pa_assert_se((reply = dbus_message_new_method_return(msg)));
>
> @@ -173,6 +191,7 @@ static void handle_get_all(DBusConnection *conn, DBusMessage *msg, void *userdat
> pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_SINKS].property_name, DBUS_TYPE_UINT32, &sinks);
> pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_SOURCES].property_name, DBUS_TYPE_UINT32, &sources);
> pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_PRIORITY].property_name, DBUS_TYPE_UINT32, &priority);
> + pa_dbus_append_basic_variant_dict_entry(&dict_iter, property_handlers[PROPERTY_HANDLER_AVAILABLE].property_name, DBUS_TYPE_BOOLEAN, &available);
>
> pa_assert_se(dbus_message_iter_close_container(&msg_iter, &dict_iter));
>
> diff --git a/src/modules/dbus/iface-card.c b/src/modules/dbus/iface-card.c
> index d0f13c9..f673a5f 100644
> --- a/src/modules/dbus/iface-card.c
> +++ b/src/modules/dbus/iface-card.c
> @@ -60,6 +60,7 @@ struct pa_dbusiface_card {
>
> pa_hook_slot *card_profile_added_slot;
> pa_hook_slot *card_profile_changed_slot;
> + pa_hook_slot *card_profile_available_slot;
>
> pa_dbus_protocol *dbus_protocol;
> };
> @@ -107,18 +108,22 @@ static pa_dbus_method_handler method_handlers[METHOD_HANDLER_MAX] = {
> enum signal_index {
> SIGNAL_ACTIVE_PROFILE_UPDATED,
> SIGNAL_NEW_PROFILE,
> + SIGNAL_PROFILE_AVAILABLE_CHANGED,
> SIGNAL_PROPERTY_LIST_UPDATED,
> SIGNAL_MAX
> };
>
> -static pa_dbus_arg_info active_profile_updated_args[] = { { "profile", "o", NULL } };
> -static pa_dbus_arg_info new_profile_args[] = { { "profile", "o", NULL } };
> -static pa_dbus_arg_info property_list_updated_args[] = { { "property_list", "a{say}", NULL } };
> +static pa_dbus_arg_info active_profile_updated_args[] = { { "profile", "o", NULL } };
> +static pa_dbus_arg_info new_profile_args[] = { { "profile", "o", NULL } };
> +static pa_dbus_arg_info profile_available_changed_args[] = { { "profile", "o", NULL },
> + { "available", "b", NULL } };
> +static pa_dbus_arg_info property_list_updated_args[] = { { "property_list", "a{say}", NULL } };
>
> static pa_dbus_signal_info signals[SIGNAL_MAX] = {
> - [SIGNAL_ACTIVE_PROFILE_UPDATED] = { .name = "ActiveProfileUpdated", .arguments = active_profile_updated_args, .n_arguments = 1 },
> - [SIGNAL_NEW_PROFILE] = { .name = "NewProfile", .arguments = new_profile_args, .n_arguments = 1 },
> - [SIGNAL_PROPERTY_LIST_UPDATED] = { .name = "PropertyListUpdated", .arguments = property_list_updated_args, .n_arguments = 1 }
> + [SIGNAL_ACTIVE_PROFILE_UPDATED] = { .name = "ActiveProfileUpdated", .arguments = active_profile_updated_args, .n_arguments = 1 },
> + [SIGNAL_NEW_PROFILE] = { .name = "NewProfile", .arguments = new_profile_args, .n_arguments = 1 },
> + [SIGNAL_PROFILE_AVAILABLE_CHANGED] = { .name = "ProfileAvailableChanged", .arguments = profile_available_changed_args, .n_arguments = 2 },
> + [SIGNAL_PROPERTY_LIST_UPDATED] = { .name = "PropertyListUpdated", .arguments = property_list_updated_args, .n_arguments = 1 }
> };
>
> static pa_dbus_interface_info card_interface_info = {
> @@ -507,6 +512,37 @@ static pa_hook_result_t card_profile_added_cb(void *hook_data, void *call_data,
> return PA_HOOK_OK;
> }
>
> +static pa_hook_result_t card_profile_available_changed_cb(void *hook_data, void *call_data, void *slot_data) {
> + pa_dbusiface_card *c = slot_data;
> + pa_card_profile *profile = call_data;
> + pa_dbusiface_card_profile *p;
> + const char *object_path;
> + dbus_bool_t available;
> + DBusMessage *signal_msg;
> +
> + if (profile->card != c->card)
> + return PA_HOOK_OK;
> +
> + pa_assert_se((p = pa_hashmap_get(c->profiles, profile->name)));
> +
> + object_path = pa_dbusiface_card_profile_get_path(p);
> + available = profile->available;
> +
> + pa_assert_se(signal_msg = dbus_message_new_signal(c->path,
> + PA_DBUSIFACE_CARD_INTERFACE,
> + signals[SIGNAL_PROFILE_AVAILABLE_CHANGED].name));
> + pa_assert_se(dbus_message_append_args(signal_msg, DBUS_TYPE_OBJECT_PATH, &object_path,
> + DBUS_TYPE_BOOLEAN, &available,
> + DBUS_TYPE_INVALID));
> +
> + pa_dbus_protocol_send_signal(c->dbus_protocol, signal_msg);
> + dbus_message_unref(signal_msg);
> +
> + check_card_proplist(c);
> +
> + return PA_HOOK_OK;
> +}
> +
> pa_dbusiface_card *pa_dbusiface_card_new(pa_dbusiface_core *core, pa_card *card) {
> pa_dbusiface_card *c = NULL;
> pa_card_profile *profile;
> @@ -537,6 +573,8 @@ pa_dbusiface_card *pa_dbusiface_card_new(pa_dbusiface_core *core, pa_card *card)
> card_profile_changed_cb, c);
> c->card_profile_added_slot = pa_hook_connect(&card->core->hooks[PA_CORE_HOOK_CARD_PROFILE_ADDED], PA_HOOK_NORMAL,
> card_profile_added_cb, c);
> + c->card_profile_available_slot = pa_hook_connect(&card->core->hooks[PA_CORE_HOOK_CARD_PROFILE_AVAILABLE_CHANGED], PA_HOOK_NORMAL,
> + card_profile_available_changed_cb, c);
>
> return c;
> }
> @@ -548,6 +586,7 @@ void pa_dbusiface_card_free(pa_dbusiface_card *c) {
>
> pa_hook_slot_free(c->card_profile_added_slot);
> pa_hook_slot_free(c->card_profile_changed_slot);
> + pa_hook_slot_free(c->card_profile_available_slot);
>
> pa_hashmap_free(c->profiles);
> pa_proplist_free(c->proplist);
>
--
David Henningsson, Canonical Ltd.
https://launchpad.net/~diwic
