static void handle_get_supported_sample_formats(DBusConnection *conn, DBusMessage *msg, void *userdata) {
pa_device_manager *dm;
DBusMessage *reply = NULL;
- DBusMessageIter msg_iter, array_iter, item_iter;
+ DBusMessageIter msg_iter, array_iter;
dbus_int32_t device_id;
pa_tz_device *device;
pa_sink *sink;
}
dbus_message_iter_init_append(reply, &msg_iter);
- pa_assert_se(dbus_message_iter_open_container(&msg_iter, DBUS_TYPE_ARRAY, "(s)", &array_iter));
+ pa_assert_se(dbus_message_iter_open_container(&msg_iter, DBUS_TYPE_ARRAY, "s", &array_iter));
for (i = 0; sink->supported_sample_formats[i] != PA_SAMPLE_MAX; i++) {
format = pa_sample_format_to_string(sink->supported_sample_formats[i]);
pa_log_info("%s is supported", format);
- pa_assert_se(dbus_message_iter_open_container(&array_iter, DBUS_TYPE_STRUCT, NULL, &item_iter));
- dbus_message_iter_append_basic(&item_iter, DBUS_TYPE_STRING, &format);
- pa_assert_se(dbus_message_iter_close_container(&array_iter, &item_iter));
+ dbus_message_iter_append_basic(&array_iter, DBUS_TYPE_STRING, &format);
}
pa_assert_se(dbus_message_iter_close_container(&msg_iter, &array_iter));
pa_assert_se(dbus_connection_send(conn, reply, NULL));
static void handle_get_supported_sample_rates(DBusConnection *conn, DBusMessage *msg, void *userdata) {
pa_device_manager *dm;
DBusMessage *reply = NULL;
- DBusMessageIter msg_iter, array_iter, item_iter;
+ DBusMessageIter msg_iter, array_iter;
dbus_int32_t device_id;
pa_tz_device *device;
pa_sink *sink;
}
dbus_message_iter_init_append(reply, &msg_iter);
- pa_assert_se(dbus_message_iter_open_container(&msg_iter, DBUS_TYPE_ARRAY, "(u)", &array_iter));
+ pa_assert_se(dbus_message_iter_open_container(&msg_iter, DBUS_TYPE_ARRAY, "u", &array_iter));
for (i = 0; sink->supported_sample_rates[i]; i++) {
pa_log_info("%u is supported", sink->supported_sample_rates[i]);
- pa_assert_se(dbus_message_iter_open_container(&array_iter, DBUS_TYPE_STRUCT, NULL, &item_iter));
- dbus_message_iter_append_basic(&item_iter, DBUS_TYPE_UINT32, &sink->supported_sample_rates[i]);
- pa_assert_se(dbus_message_iter_close_container(&array_iter, &item_iter));
+ dbus_message_iter_append_basic(&array_iter, DBUS_TYPE_UINT32, &sink->supported_sample_rates[i]);
}
pa_assert_se(dbus_message_iter_close_container(&msg_iter, &array_iter));
pa_assert_se(dbus_connection_send(conn, reply, NULL));