diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2008-10-16 21:23:43 +0300 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2008-10-16 21:23:43 +0300 |
| commit | 102df1da56cf6bdec1c67682da7858c35a3ae5ab (patch) | |
| tree | b44ffc351a62fe0380acc6cff885f7953ae31cb5 /audio | |
| parent | 1262c4767c74f084d37c84bec778513f3d862a3e (diff) | |
Fix remaining places to use dict_append_entry too
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/control.c | 3 | ||||
| -rw-r--r-- | audio/headset.c | 16 | ||||
| -rw-r--r-- | audio/sink.c | 6 |
3 files changed, 9 insertions, 16 deletions
diff --git a/audio/control.c b/audio/control.c index 3e4e776a..849af932 100644 --- a/audio/control.c +++ b/audio/control.c @@ -998,8 +998,7 @@ static DBusMessage *control_get_properties(DBusConnection *conn, /* Connected */ value = (device->control->session != NULL); - dbus_message_iter_append_dict_entry(&dict, "Connected", - DBUS_TYPE_BOOLEAN, &value); + dict_append_entry(&dict, "Connected", DBUS_TYPE_BOOLEAN, &value); dbus_message_iter_close_container(&iter, &dict); diff --git a/audio/headset.c b/audio/headset.c index 44b1f801..5f6f00f0 100644 --- a/audio/headset.c +++ b/audio/headset.c @@ -1746,26 +1746,22 @@ static DBusMessage *hs_get_properties(DBusConnection *conn, /* Playing */ value = (device->headset->state == HEADSET_STATE_PLAYING); - dbus_message_iter_append_dict_entry(&dict, "Playing", - DBUS_TYPE_BOOLEAN, &value); + dict_append_entry(&dict, "Playing", DBUS_TYPE_BOOLEAN, &value); /* Connected */ value = (device->headset->state >= HEADSET_STATE_CONNECTED); - dbus_message_iter_append_dict_entry(&dict, "Connected", - DBUS_TYPE_BOOLEAN, &value); + dict_append_entry(&dict, "Connected", DBUS_TYPE_BOOLEAN, &value); if (!value) goto done; /* SpeakerGain */ - dbus_message_iter_append_dict_entry(&dict, "SpeakerGain", - DBUS_TYPE_UINT16, - &device->headset->sp_gain); + dict_append_entry(&dict, "SpeakerGain", + DBUS_TYPE_UINT16, &device->headset->sp_gain); /* MicrophoneGain */ - dbus_message_iter_append_dict_entry(&dict, "MicrophoneGain", - DBUS_TYPE_UINT16, - &device->headset->mic_gain); + dict_append_entry(&dict, "MicrophoneGain", + DBUS_TYPE_UINT16, &device->headset->mic_gain); done: dbus_message_iter_close_container(&iter, &dict); diff --git a/audio/sink.c b/audio/sink.c index 0d273e93..a1034c1a 100644 --- a/audio/sink.c +++ b/audio/sink.c @@ -532,13 +532,11 @@ static DBusMessage *sink_get_properties(DBusConnection *conn, /* Playing */ value = (device->sink->state == AVDTP_STATE_STREAMING); - dbus_message_iter_append_dict_entry(&dict, "Playing", - DBUS_TYPE_BOOLEAN, &value); + dict_append_entry(&dict, "Playing", DBUS_TYPE_BOOLEAN, &value); /* Connected */ value = (device->sink->state >= AVDTP_STATE_CONFIGURED); - dbus_message_iter_append_dict_entry(&dict, "Connected", - DBUS_TYPE_BOOLEAN, &value); + dict_append_entry(&dict, "Connected", DBUS_TYPE_BOOLEAN, &value); dbus_message_iter_close_container(&iter, &dict); |