summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
Diffstat (limited to 'audio')
-rw-r--r--audio/control.c16
-rw-r--r--audio/headset.c26
-rw-r--r--audio/sink.c24
3 files changed, 30 insertions, 36 deletions
diff --git a/audio/control.c b/audio/control.c
index a7cea16a..7c15f769 100644
--- a/audio/control.c
+++ b/audio/control.c
@@ -420,11 +420,9 @@ static void avctp_unref(struct avctp *session)
if (session->state == AVCTP_STATE_CONNECTED) {
gboolean value = FALSE;
- g_dbus_emit_signal(session->dev->conn,
- session->dev->path,
- AUDIO_CONTROL_INTERFACE,
- "Disconnected",
- DBUS_TYPE_INVALID);
+ g_dbus_emit_signal(session->dev->conn, session->dev->path,
+ AUDIO_CONTROL_INTERFACE,
+ "Disconnected", DBUS_TYPE_INVALID);
emit_property_changed(session->dev->conn, session->dev->path,
AUDIO_CONTROL_INTERFACE, "Connected",
DBUS_TYPE_BOOLEAN, &value);
@@ -623,8 +621,8 @@ static gboolean avctp_connect_session(struct avctp *session)
value = TRUE;
g_dbus_emit_signal(session->dev->conn, session->dev->path,
- AUDIO_CONTROL_INTERFACE, "Connected",
- DBUS_TYPE_INVALID);
+ AUDIO_CONTROL_INTERFACE, "Connected",
+ DBUS_TYPE_INVALID);
emit_property_changed(session->dev->conn, session->dev->path,
AUDIO_CONTROL_INTERFACE, "Connected",
DBUS_TYPE_BOOLEAN, &value);
@@ -794,8 +792,8 @@ static void avctp_connect_cb(GIOChannel *chan, int err, const bdaddr_t *src,
init_uinput(session);
g_dbus_emit_signal(session->dev->conn, session->dev->path,
- AUDIO_CONTROL_INTERFACE, "Connected",
- DBUS_TYPE_INVALID);
+ AUDIO_CONTROL_INTERFACE, "Connected",
+ DBUS_TYPE_INVALID);
session->state = AVCTP_STATE_CONNECTED;
session->mtu = l2o.imtu;
diff --git a/audio/headset.c b/audio/headset.c
index cb0fa9a3..cccc0846 100644
--- a/audio/headset.c
+++ b/audio/headset.c
@@ -1681,17 +1681,17 @@ done:
if (type == HEADSET_GAIN_SPEAKER) {
hs->sp_gain = gain;
g_dbus_emit_signal(conn, device->path,
- AUDIO_HEADSET_INTERFACE,
- "SpeakerGainChanged",
- DBUS_TYPE_UINT16, &gain,
- DBUS_TYPE_INVALID);
+ AUDIO_HEADSET_INTERFACE,
+ "SpeakerGainChanged",
+ DBUS_TYPE_UINT16, &gain,
+ DBUS_TYPE_INVALID);
} else {
hs->mic_gain = gain;
g_dbus_emit_signal(conn, device->path,
- AUDIO_HEADSET_INTERFACE,
- "MicrophoneGainChanged",
- DBUS_TYPE_UINT16, &gain,
- DBUS_TYPE_INVALID);
+ AUDIO_HEADSET_INTERFACE,
+ "MicrophoneGainChanged",
+ DBUS_TYPE_UINT16, &gain,
+ DBUS_TYPE_INVALID);
}
return reply;
@@ -2216,9 +2216,9 @@ void headset_set_state(struct audio_device *dev, headset_state_t state)
close_sco(dev);
headset_close_rfcomm(dev);
g_dbus_emit_signal(dev->conn, dev->path,
- AUDIO_HEADSET_INTERFACE,
- "Disconnected",
- DBUS_TYPE_INVALID);
+ AUDIO_HEADSET_INTERFACE,
+ "Disconnected",
+ DBUS_TYPE_INVALID);
emit_property_changed(dev->conn, dev->path,
AUDIO_HEADSET_INTERFACE, "Connected",
DBUS_TYPE_BOOLEAN, &value);
@@ -2262,8 +2262,8 @@ void headset_set_state(struct audio_device *dev, headset_state_t state)
(GIOFunc) sco_cb, dev);
g_dbus_emit_signal(dev->conn, dev->path,
- AUDIO_HEADSET_INTERFACE,
- "Playing", DBUS_TYPE_INVALID);
+ AUDIO_HEADSET_INTERFACE, "Playing",
+ DBUS_TYPE_INVALID);
emit_property_changed(dev->conn, dev->path,
AUDIO_HEADSET_INTERFACE, "Playing",
DBUS_TYPE_BOOLEAN, &value);
diff --git a/audio/sink.c b/audio/sink.c
index a2dfd69e..e216980a 100644
--- a/audio/sink.c
+++ b/audio/sink.c
@@ -87,10 +87,8 @@ static void stream_state_changed(struct avdtp_stream *stream,
switch (new_state) {
case AVDTP_STATE_IDLE:
value = FALSE;
- g_dbus_emit_signal(dev->conn, dev->path,
- AUDIO_SINK_INTERFACE,
- "Disconnected",
- DBUS_TYPE_INVALID);
+ g_dbus_emit_signal(dev->conn, dev->path, AUDIO_SINK_INTERFACE,
+ "Disconnected", DBUS_TYPE_INVALID);
emit_property_changed(dev->conn, dev->path,
AUDIO_SINK_INTERFACE, "Connected",
DBUS_TYPE_BOOLEAN, &value);
@@ -118,9 +116,9 @@ static void stream_state_changed(struct avdtp_stream *stream,
if (old_state == AVDTP_STATE_CONFIGURED) {
value = TRUE;
g_dbus_emit_signal(dev->conn, dev->path,
- AUDIO_SINK_INTERFACE,
- "Connected",
- DBUS_TYPE_INVALID);
+ AUDIO_SINK_INTERFACE,
+ "Connected",
+ DBUS_TYPE_INVALID);
emit_property_changed(dev->conn, dev->path,
AUDIO_SINK_INTERFACE,
"Connected",
@@ -128,9 +126,9 @@ static void stream_state_changed(struct avdtp_stream *stream,
} else if (old_state == AVDTP_STATE_STREAMING) {
value = FALSE;
g_dbus_emit_signal(dev->conn, dev->path,
- AUDIO_SINK_INTERFACE,
- "Stopped",
- DBUS_TYPE_INVALID);
+ AUDIO_SINK_INTERFACE,
+ "Stopped",
+ DBUS_TYPE_INVALID);
emit_property_changed(dev->conn, dev->path,
AUDIO_SINK_INTERFACE,
"Playing",
@@ -139,10 +137,8 @@ static void stream_state_changed(struct avdtp_stream *stream,
break;
case AVDTP_STATE_STREAMING:
value = TRUE;
- g_dbus_emit_signal(dev->conn, dev->path,
- AUDIO_SINK_INTERFACE,
- "Playing",
- DBUS_TYPE_INVALID);
+ g_dbus_emit_signal(dev->conn, dev->path, AUDIO_SINK_INTERFACE,
+ "Playing", DBUS_TYPE_INVALID);
emit_property_changed(dev->conn, dev->path,
AUDIO_SINK_INTERFACE, "Playing",
DBUS_TYPE_BOOLEAN, &value);