diff options
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/control.c | 16 | ||||
| -rw-r--r-- | audio/headset.c | 20 | ||||
| -rw-r--r-- | audio/sink.c | 34 |
3 files changed, 29 insertions, 41 deletions
diff --git a/audio/control.c b/audio/control.c index 849af932..a7cea16a 100644 --- a/audio/control.c +++ b/audio/control.c @@ -425,11 +425,9 @@ static void avctp_unref(struct avctp *session) AUDIO_CONTROL_INTERFACE, "Disconnected", DBUS_TYPE_INVALID); - dbus_connection_emit_property_changed(session->dev->conn, - session->dev->path, - AUDIO_CONTROL_INTERFACE, - "Connected", - DBUS_TYPE_BOOLEAN, &value); + emit_property_changed(session->dev->conn, session->dev->path, + AUDIO_CONTROL_INTERFACE, "Connected", + DBUS_TYPE_BOOLEAN, &value); } if (session->sock >= 0) @@ -627,11 +625,9 @@ static gboolean avctp_connect_session(struct avctp *session) g_dbus_emit_signal(session->dev->conn, session->dev->path, AUDIO_CONTROL_INTERFACE, "Connected", DBUS_TYPE_INVALID); - dbus_connection_emit_property_changed(session->dev->conn, - session->dev->path, - AUDIO_CONTROL_INTERFACE, - "Connected", - DBUS_TYPE_BOOLEAN, &value); + emit_property_changed(session->dev->conn, session->dev->path, + AUDIO_CONTROL_INTERFACE, "Connected", + DBUS_TYPE_BOOLEAN, &value); if (session->io) g_source_remove(session->io); diff --git a/audio/headset.c b/audio/headset.c index 5f6f00f0..cb0fa9a3 100644 --- a/audio/headset.c +++ b/audio/headset.c @@ -885,7 +885,7 @@ static int signal_gain_setting(struct audio_device *device, const char *buf) DBUS_TYPE_UINT16, &gain, DBUS_TYPE_INVALID); - dbus_connection_emit_property_changed(device->conn, device->path, + emit_property_changed(device->conn, device->path, AUDIO_HEADSET_INTERFACE, property, DBUS_TYPE_UINT16, &gain); @@ -2219,10 +2219,9 @@ void headset_set_state(struct audio_device *dev, headset_state_t state) AUDIO_HEADSET_INTERFACE, "Disconnected", DBUS_TYPE_INVALID); - dbus_connection_emit_property_changed(dev->conn, dev->path, - AUDIO_HEADSET_INTERFACE, - "Connected", - DBUS_TYPE_BOOLEAN, &value); + emit_property_changed(dev->conn, dev->path, + AUDIO_HEADSET_INTERFACE, "Connected", + DBUS_TYPE_BOOLEAN, &value); telephony_device_disconnected(dev); active_devices = g_slist_remove(active_devices, dev); break; @@ -2236,7 +2235,7 @@ void headset_set_state(struct audio_device *dev, headset_state_t state) AUDIO_HEADSET_INTERFACE, "Connected", DBUS_TYPE_INVALID); - dbus_connection_emit_property_changed(dev->conn, dev->path, + emit_property_changed(dev->conn, dev->path, AUDIO_HEADSET_INTERFACE, "Connected", DBUS_TYPE_BOOLEAN, &value); @@ -2248,7 +2247,7 @@ void headset_set_state(struct audio_device *dev, headset_state_t state) AUDIO_HEADSET_INTERFACE, "Stopped", DBUS_TYPE_INVALID); - dbus_connection_emit_property_changed(dev->conn, dev->path, + emit_property_changed(dev->conn, dev->path, AUDIO_HEADSET_INTERFACE, "Playing", DBUS_TYPE_BOOLEAN, &value); @@ -2265,10 +2264,9 @@ void headset_set_state(struct audio_device *dev, headset_state_t state) g_dbus_emit_signal(dev->conn, dev->path, AUDIO_HEADSET_INTERFACE, "Playing", DBUS_TYPE_INVALID); - dbus_connection_emit_property_changed(dev->conn, dev->path, - AUDIO_HEADSET_INTERFACE, - "Playing", - DBUS_TYPE_BOOLEAN, &value); + emit_property_changed(dev->conn, dev->path, + AUDIO_HEADSET_INTERFACE, "Playing", + DBUS_TYPE_BOOLEAN, &value); if (hs->sp_gain >= 0) headset_send(hs, "\r\n+VGS=%u\r\n", hs->sp_gain); diff --git a/audio/sink.c b/audio/sink.c index a1034c1a..a2dfd69e 100644 --- a/audio/sink.c +++ b/audio/sink.c @@ -91,10 +91,9 @@ static void stream_state_changed(struct avdtp_stream *stream, AUDIO_SINK_INTERFACE, "Disconnected", DBUS_TYPE_INVALID); - dbus_connection_emit_property_changed(dev->conn, dev->path, - AUDIO_SINK_INTERFACE, - "Connected", - DBUS_TYPE_BOOLEAN, &value); + emit_property_changed(dev->conn, dev->path, + AUDIO_SINK_INTERFACE, "Connected", + DBUS_TYPE_BOOLEAN, &value); if (sink->disconnect) { DBusMessage *reply; struct pending_request *p; @@ -122,24 +121,20 @@ static void stream_state_changed(struct avdtp_stream *stream, AUDIO_SINK_INTERFACE, "Connected", DBUS_TYPE_INVALID); - dbus_connection_emit_property_changed(dev->conn, - dev->path, - AUDIO_SINK_INTERFACE, - "Connected", - DBUS_TYPE_BOOLEAN, - &value); + emit_property_changed(dev->conn, dev->path, + AUDIO_SINK_INTERFACE, + "Connected", + DBUS_TYPE_BOOLEAN, &value); } else if (old_state == AVDTP_STATE_STREAMING) { value = FALSE; g_dbus_emit_signal(dev->conn, dev->path, AUDIO_SINK_INTERFACE, "Stopped", DBUS_TYPE_INVALID); - dbus_connection_emit_property_changed(dev->conn, - dev->path, - AUDIO_SINK_INTERFACE, - "Playing", - DBUS_TYPE_BOOLEAN, - &value); + emit_property_changed(dev->conn, dev->path, + AUDIO_SINK_INTERFACE, + "Playing", + DBUS_TYPE_BOOLEAN, &value); } break; case AVDTP_STATE_STREAMING: @@ -148,10 +143,9 @@ static void stream_state_changed(struct avdtp_stream *stream, AUDIO_SINK_INTERFACE, "Playing", DBUS_TYPE_INVALID); - dbus_connection_emit_property_changed(dev->conn, dev->path, - AUDIO_SINK_INTERFACE, - "Playing", - DBUS_TYPE_BOOLEAN, &value); + emit_property_changed(dev->conn, dev->path, + AUDIO_SINK_INTERFACE, "Playing", + DBUS_TYPE_BOOLEAN, &value); break; case AVDTP_STATE_CONFIGURED: case AVDTP_STATE_CLOSING: |