diff options
author | Andrzej Kaczmarek <andrzej.kaczmarek@tieto.com> | 2012-09-19 12:22:05 +0200 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-09-21 13:49:34 +0300 |
commit | b9953680ea96c977b20dbb639883d5bba6e3a4ce (patch) | |
tree | d09115fb3faa8a26c5aec17b33a536bd3a199580 /audio | |
parent | be9a40bfc276b240530bc6b82d5bad7930c2ffee (diff) | |
download | bluez-b9953680ea96c977b20dbb639883d5bba6e3a4ce.tar.gz |
dbus-common: Remove conn parameter from emit_property_changed
Valid DBusConnection pointer is available static variable 'connection'
so it's it's redundant to pass it as function parameter.
Diffstat (limited to 'audio')
-rw-r--r-- | audio/control.c | 8 | ||||
-rw-r--r-- | audio/device.c | 2 | ||||
-rw-r--r-- | audio/gateway.c | 6 | ||||
-rw-r--r-- | audio/headset.c | 18 | ||||
-rw-r--r-- | audio/sink.c | 10 | ||||
-rw-r--r-- | audio/source.c | 2 | ||||
-rw-r--r-- | audio/transport.c | 8 |
7 files changed, 27 insertions, 27 deletions
diff --git a/audio/control.c b/audio/control.c index 5477c2d9e..02aea33a0 100644 --- a/audio/control.c +++ b/audio/control.c @@ -80,7 +80,7 @@ static void state_changed(struct audio_device *dev, avctp_state_t old_state, g_dbus_emit_signal(dev->conn, dev->path, AUDIO_CONTROL_INTERFACE, "Disconnected", DBUS_TYPE_INVALID); - emit_property_changed(dev->conn, dev->path, + emit_property_changed(dev->path, AUDIO_CONTROL_INTERFACE, "Connected", DBUS_TYPE_BOOLEAN, &value); @@ -97,9 +97,9 @@ static void state_changed(struct audio_device *dev, avctp_state_t old_state, g_dbus_emit_signal(dev->conn, dev->path, AUDIO_CONTROL_INTERFACE, "Connected", DBUS_TYPE_INVALID); - emit_property_changed(dev->conn, dev->path, - AUDIO_CONTROL_INTERFACE, "Connected", - DBUS_TYPE_BOOLEAN, &value); + emit_property_changed(dev->path, + AUDIO_CONTROL_INTERFACE, "Connected", + DBUS_TYPE_BOOLEAN, &value); break; default: return; diff --git a/audio/device.c b/audio/device.c index 4952b5734..b93a29483 100644 --- a/audio/device.c +++ b/audio/device.c @@ -280,7 +280,7 @@ static void device_set_state(struct audio_device *dev, audio_state_t new_state) g_dbus_send_message(dev->conn, reply); } - emit_property_changed(dev->conn, dev->path, + emit_property_changed(dev->path, AUDIO_INTERFACE, "State", DBUS_TYPE_STRING, &state_str); } diff --git a/audio/gateway.c b/audio/gateway.c index 53094af0e..0fe29d1ae 100644 --- a/audio/gateway.c +++ b/audio/gateway.c @@ -129,9 +129,9 @@ static void change_state(struct audio_device *dev, gateway_state_t new_state) old_state = gw->state; gw->state = new_state; - emit_property_changed(dev->conn, dev->path, - AUDIO_GATEWAY_INTERFACE, "State", - DBUS_TYPE_STRING, &val); + emit_property_changed(dev->path, + AUDIO_GATEWAY_INTERFACE, "State", + DBUS_TYPE_STRING, &val); for (l = gateway_callbacks; l != NULL; l = l->next) { struct gateway_state_callback *cb = l->data; diff --git a/audio/headset.c b/audio/headset.c index 1ef6c491c..3ded18e24 100644 --- a/audio/headset.c +++ b/audio/headset.c @@ -988,7 +988,7 @@ static int headset_set_gain(struct audio_device *device, uint16_t gain, char typ DBUS_TYPE_UINT16, &gain, DBUS_TYPE_INVALID); - emit_property_changed(device->conn, device->path, + emit_property_changed(device->path, AUDIO_HEADSET_INTERFACE, property, DBUS_TYPE_UINT16, &gain); @@ -2343,7 +2343,7 @@ void headset_set_state(struct audio_device *dev, headset_state_t state) value = FALSE; close_sco(dev); headset_close_rfcomm(dev); - emit_property_changed(dev->conn, dev->path, + emit_property_changed(dev->path, AUDIO_HEADSET_INTERFACE, "State", DBUS_TYPE_STRING, &state_str); g_dbus_emit_signal(dev->conn, dev->path, @@ -2351,7 +2351,7 @@ void headset_set_state(struct audio_device *dev, headset_state_t state) "Disconnected", DBUS_TYPE_INVALID); if (hs->state > HEADSET_STATE_CONNECTING) { - emit_property_changed(dev->conn, dev->path, + emit_property_changed(dev->path, AUDIO_HEADSET_INTERFACE, "Connected", DBUS_TYPE_BOOLEAN, &value); telephony_device_disconnected(dev); @@ -2359,14 +2359,14 @@ void headset_set_state(struct audio_device *dev, headset_state_t state) active_devices = g_slist_remove(active_devices, dev); break; case HEADSET_STATE_CONNECTING: - emit_property_changed(dev->conn, dev->path, + emit_property_changed(dev->path, AUDIO_HEADSET_INTERFACE, "State", DBUS_TYPE_STRING, &state_str); break; case HEADSET_STATE_CONNECTED: close_sco(dev); if (hs->state != HEADSET_STATE_PLAY_IN_PROGRESS) - emit_property_changed(dev->conn, dev->path, + emit_property_changed(dev->path, AUDIO_HEADSET_INTERFACE, "State", DBUS_TYPE_STRING, &state_str); if (hs->state < state) { @@ -2379,7 +2379,7 @@ void headset_set_state(struct audio_device *dev, headset_state_t state) "Connected", DBUS_TYPE_INVALID); value = TRUE; - emit_property_changed(dev->conn, dev->path, + emit_property_changed(dev->path, AUDIO_HEADSET_INTERFACE, "Connected", DBUS_TYPE_BOOLEAN, &value); @@ -2391,7 +2391,7 @@ void headset_set_state(struct audio_device *dev, headset_state_t state) AUDIO_HEADSET_INTERFACE, "Stopped", DBUS_TYPE_INVALID); - emit_property_changed(dev->conn, dev->path, + emit_property_changed(dev->path, AUDIO_HEADSET_INTERFACE, "Playing", DBUS_TYPE_BOOLEAN, &value); @@ -2401,7 +2401,7 @@ void headset_set_state(struct audio_device *dev, headset_state_t state) break; case HEADSET_STATE_PLAYING: value = TRUE; - emit_property_changed(dev->conn, dev->path, + emit_property_changed(dev->path, AUDIO_HEADSET_INTERFACE, "State", DBUS_TYPE_STRING, &state_str); @@ -2414,7 +2414,7 @@ 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); - emit_property_changed(dev->conn, dev->path, + emit_property_changed(dev->path, AUDIO_HEADSET_INTERFACE, "Playing", DBUS_TYPE_BOOLEAN, &value); diff --git a/audio/sink.c b/audio/sink.c index 53a0b80ce..6201d8579 100644 --- a/audio/sink.c +++ b/audio/sink.c @@ -116,7 +116,7 @@ static void sink_set_state(struct audio_device *dev, sink_state_t new_state) state_str = state2str(new_state); if (state_str) - emit_property_changed(dev->conn, dev->path, + emit_property_changed(dev->path, AUDIO_SINK_INTERFACE, "State", DBUS_TYPE_STRING, &state_str); @@ -147,7 +147,7 @@ static void avdtp_state_callback(struct audio_device *dev, g_dbus_emit_signal(dev->conn, dev->path, AUDIO_SINK_INTERFACE, "Disconnected", DBUS_TYPE_INVALID); - emit_property_changed(dev->conn, dev->path, + emit_property_changed(dev->path, AUDIO_SINK_INTERFACE, "Connected", DBUS_TYPE_BOOLEAN, &value); } @@ -218,7 +218,7 @@ static void stream_state_changed(struct avdtp_stream *stream, AUDIO_SINK_INTERFACE, "Connected", DBUS_TYPE_INVALID); - emit_property_changed(dev->conn, dev->path, + emit_property_changed(dev->path, AUDIO_SINK_INTERFACE, "Connected", DBUS_TYPE_BOOLEAN, &value); @@ -228,7 +228,7 @@ static void stream_state_changed(struct avdtp_stream *stream, AUDIO_SINK_INTERFACE, "Stopped", DBUS_TYPE_INVALID); - emit_property_changed(dev->conn, dev->path, + emit_property_changed(dev->path, AUDIO_SINK_INTERFACE, "Playing", DBUS_TYPE_BOOLEAN, &value); @@ -239,7 +239,7 @@ static void stream_state_changed(struct avdtp_stream *stream, value = TRUE; g_dbus_emit_signal(dev->conn, dev->path, AUDIO_SINK_INTERFACE, "Playing", DBUS_TYPE_INVALID); - emit_property_changed(dev->conn, dev->path, + emit_property_changed(dev->path, AUDIO_SINK_INTERFACE, "Playing", DBUS_TYPE_BOOLEAN, &value); sink_set_state(dev, SINK_STATE_PLAYING); diff --git a/audio/source.c b/audio/source.c index e4ba21143..8e0166669 100644 --- a/audio/source.c +++ b/audio/source.c @@ -110,7 +110,7 @@ static void source_set_state(struct audio_device *dev, source_state_t new_state) state_str = state2str(new_state); if (state_str) - emit_property_changed(dev->conn, dev->path, + emit_property_changed(dev->path, AUDIO_SOURCE_INTERFACE, "State", DBUS_TYPE_STRING, &state_str); diff --git a/audio/transport.c b/audio/transport.c index 281895e17..6541fc197 100644 --- a/audio/transport.c +++ b/audio/transport.c @@ -203,7 +203,7 @@ static void transport_set_state(struct media_transport *transport, str = state2str(state); if (g_strcmp0(str, state2str(old_state)) != 0) - emit_property_changed(transport->conn, transport->path, + emit_property_changed(transport->path, MEDIA_TRANSPORT_INTERFACE, "State", DBUS_TYPE_STRING, &str); } @@ -1168,7 +1168,7 @@ static void headset_nrec_changed(struct audio_device *dev, gboolean nrec, DBG(""); - emit_property_changed(transport->conn, transport->path, + emit_property_changed(transport->path, MEDIA_TRANSPORT_INTERFACE, "NREC", DBUS_TYPE_BOOLEAN, &nrec); } @@ -1367,7 +1367,7 @@ void media_transport_update_delay(struct media_transport *transport, a2dp->delay = delay; - emit_property_changed(transport->conn, transport->path, + emit_property_changed(transport->path, MEDIA_TRANSPORT_INTERFACE, "Delay", DBUS_TYPE_UINT16, &a2dp->delay); } @@ -1388,7 +1388,7 @@ void media_transport_update_volume(struct media_transport *transport, a2dp->volume = volume; - emit_property_changed(transport->conn, transport->path, + emit_property_changed(transport->path, MEDIA_TRANSPORT_INTERFACE, "Volume", DBUS_TYPE_UINT16, &a2dp->volume); } |