More coding style fixes

10 files changed, 113 insertions, 112 deletions

diff --git a/audio/ctl_bluetooth.c b/audio/ctl_bluetooth.c
index 6425f076..9d09308d 100644
--- a/audio/ctl_bluetooth.c
+++ b/audio/ctl_bluetooth.c
@@ -121,8 +121,8 @@ static int bluetooth_get_attribute(snd_ctl_ext_t *ext, snd_ctl_ext_key_t key,
 {
 	DBG("ext %p key %ld", ext, key);
 
-	*type  = SND_CTL_ELEM_TYPE_INTEGER;
-	*acc   = SND_CTL_EXT_ACCESS_READWRITE;
+	*type = SND_CTL_ELEM_TYPE_INTEGER;
+	*acc = SND_CTL_EXT_ACCESS_READWRITE;
 	*count = 1;
 
 	return 0;
diff --git a/audio/gsta2dpsink.c b/audio/gsta2dpsink.c
index 00180cc8..22625a65 100644
--- a/audio/gsta2dpsink.c
+++ b/audio/gsta2dpsink.c
@@ -79,7 +79,7 @@ static void gst_a2dp_sink_finalize(GObject *obj)
 
 	g_mutex_free(self->cb_mutex);
 
-	G_OBJECT_CLASS (parent_class)->finalize (obj);
+	G_OBJECT_CLASS(parent_class)->finalize(obj);
 }
 
 static GstState gst_a2dp_sink_get_state(GstA2dpSink *self)
@@ -297,7 +297,7 @@ static GstStateChangeReturn gst_a2dp_sink_change_state(GstElement *element,
 		return ret;
 
 	ret = GST_ELEMENT_CLASS(parent_class)->change_state(element,
-                        transition);
+								transition);
 
 	switch (transition) {
 	case GST_STATE_CHANGE_PAUSED_TO_READY:
@@ -388,7 +388,7 @@ static GstCaps *gst_a2dp_sink_get_caps(GstPad *pad)
 		caps = gst_a2dp_sink_get_device_caps(self);
 		if (caps == NULL)
 			caps = gst_static_pad_template_get_caps(
-                                &gst_a2dp_sink_factory);
+					&gst_a2dp_sink_factory);
 	}
 	caps_aux = gst_caps_copy(caps);
 	g_object_set(self->capsfilter, "caps", caps_aux, NULL);
@@ -441,7 +441,7 @@ static gboolean gst_a2dp_sink_init_avdtp_sink(GstA2dpSink *self)
 	return TRUE;
 
 remove_element_and_fail:
-	gst_element_set_state (sink, GST_STATE_NULL);
+	gst_element_set_state(sink, GST_STATE_NULL);
 	gst_bin_remove(GST_BIN(self), sink);
 	return FALSE;
 
@@ -637,10 +637,10 @@ static gboolean gst_a2dp_sink_init_fakesink(GstA2dpSink *self)
 	if (self->fakesink != NULL)
 		return TRUE;
 
-	g_mutex_lock (self->cb_mutex);
+	g_mutex_lock(self->cb_mutex);
 	self->fakesink = gst_a2dp_sink_init_element(self, "fakesink",
 			"fakesink", self->capsfilter);
-	g_mutex_unlock (self->cb_mutex);
+	g_mutex_unlock(self->cb_mutex);
 
 	if (!self->fakesink)
 		return FALSE;
@@ -693,9 +693,9 @@ static void gst_a2dp_sink_init(GstA2dpSink *self,
 
 }
 
-gboolean gst_a2dp_sink_plugin_init (GstPlugin *plugin)
+gboolean gst_a2dp_sink_plugin_init(GstPlugin *plugin)
 {
-	return gst_element_register (plugin, "a2dpsink",
+	return gst_element_register(plugin, "a2dpsink",
 			GST_RANK_PRIMARY, GST_TYPE_A2DP_SINK);
 }
 
diff --git a/audio/gstavdtpsink.c b/audio/gstavdtpsink.c
index 311b4425..c1af4b70 100644
--- a/audio/gstavdtpsink.c
+++ b/audio/gstavdtpsink.c
@@ -53,11 +53,11 @@ GST_DEBUG_CATEGORY_STATIC(avdtp_sink_debug);
 #define DEFAULT_AUTOCONNECT TRUE
 
 #define GST_AVDTP_SINK_MUTEX_LOCK(s) G_STMT_START {	\
-		g_mutex_lock (s->sink_lock);		\
+		g_mutex_lock(s->sink_lock);		\
 	} G_STMT_END
 
 #define GST_AVDTP_SINK_MUTEX_UNLOCK(s) G_STMT_START {	\
-		g_mutex_unlock (s->sink_lock);		\
+		g_mutex_unlock(s->sink_lock);		\
 	} G_STMT_END
 
 
@@ -917,10 +917,10 @@ static gboolean gst_avdtp_sink_stream_start(GstAvdtpSink *self)
 	gchar buf[BT_SUGGESTED_BUFFER_SIZE];
 	struct bt_start_stream_req *req = (void *) buf;
 	struct bt_start_stream_rsp *rsp = (void *) buf;
-	struct bt_new_stream_ind *ind = (void*) buf;
+	struct bt_new_stream_ind *ind = (void *) buf;
 	GIOError io_error;
 
-	memset (req, 0, sizeof(buf));
+	memset(req, 0, sizeof(buf));
 	req->h.type = BT_REQUEST;
 	req->h.name = BT_START_STREAM;
 	req->h.length = sizeof(*req);
@@ -1048,7 +1048,7 @@ static gboolean gst_avdtp_sink_configure(GstAvdtpSink *self,
 	GST_DEBUG_OBJECT(self, "configuring device with caps: %s", temp);
 	g_free(temp);
 
-	memset (req, 0, sizeof(buf));
+	memset(req, 0, sizeof(buf));
 	req->h.type = BT_REQUEST;
 	req->h.name = BT_SET_CONFIGURATION;
 	req->h.length = sizeof(*req);
@@ -1137,7 +1137,7 @@ static gboolean gst_avdtp_sink_unlock(GstBaseSink *basesink)
 	GstAvdtpSink *self = GST_AVDTP_SINK(basesink);
 
 	if (self->stream != NULL)
-		g_io_channel_flush (self->stream, NULL);
+		g_io_channel_flush(self->stream, NULL);
 
 	return TRUE;
 }
@@ -1316,10 +1316,10 @@ static GIOError gst_avdtp_sink_audioservice_expect(
 	return status;
 }
 
-gboolean gst_avdtp_sink_plugin_init (GstPlugin *plugin)
+gboolean gst_avdtp_sink_plugin_init(GstPlugin *plugin)
 {
-	return gst_element_register (plugin, "avdtpsink",
-			GST_RANK_NONE, GST_TYPE_AVDTP_SINK);
+	return gst_element_register(plugin, "avdtpsink", GST_RANK_NONE,
+							GST_TYPE_AVDTP_SINK);
 }
 
 
diff --git a/audio/gstrtpsbcpay.c b/audio/gstrtpsbcpay.c
index 3627ad0b..894fa9d8 100644
--- a/audio/gstrtpsbcpay.c
+++ b/audio/gstrtpsbcpay.c
@@ -36,21 +36,21 @@
 #if __BYTE_ORDER == __LITTLE_ENDIAN
 
 struct rtp_payload {
-        guint8 frame_count:4;
-        guint8 rfa0:1;
-        guint8 is_last_fragment:1;
-        guint8 is_first_fragment:1;
-        guint8 is_fragmented:1;
+	guint8 frame_count:4;
+	guint8 rfa0:1;
+	guint8 is_last_fragment:1;
+	guint8 is_first_fragment:1;
+	guint8 is_fragmented:1;
 } __attribute__ ((packed));
 
 #elif __BYTE_ORDER == __BIG_ENDIAN
 
 struct rtp_payload {
-        guint8 is_fragmented:1;
-        guint8 is_first_fragment:1;
-        guint8 is_last_fragment:1;
-        guint8 rfa0:1;
-        guint8 frame_count:4;
+	guint8 is_fragmented:1;
+	guint8 is_first_fragment:1;
+	guint8 is_last_fragment:1;
+	guint8 rfa0:1;
+	guint8 frame_count:4;
 } __attribute__ ((packed));
 
 #else
@@ -97,13 +97,13 @@ static GstStaticPadTemplate gst_rtp_sbc_pay_src_factory =
 			"encoding-name = (string) \"SBC\"")
 	);
 
-static void gst_rtp_sbc_pay_set_property (GObject * object, guint prop_id,
-                        const GValue * value, GParamSpec * pspec);
-static void gst_rtp_sbc_pay_get_property (GObject * object, guint prop_id,
-                        GValue * value, GParamSpec * pspec);
+static void gst_rtp_sbc_pay_set_property(GObject *object, guint prop_id,
+				const GValue *value, GParamSpec *pspec);
+static void gst_rtp_sbc_pay_get_property(GObject *object, guint prop_id,
+				GValue *value, GParamSpec *pspec);
 
 static gint gst_rtp_sbc_pay_get_frame_len(gint subbands, gint channels,
-		gint blocks, gint bitpool, const gchar* channel_mode)
+		gint blocks, gint bitpool, const gchar *channel_mode)
 {
 	gint len;
 	gint join;
@@ -112,10 +112,10 @@ static gint gst_rtp_sbc_pay_get_frame_len(gint subbands, gint channels,
 
 	if (strcmp(channel_mode, "mono") == 0 ||
 		strcmp(channel_mode, "dual") == 0)
-		len += ((blocks * channels * bitpool)+7) / 8;
+		len += ((blocks * channels * bitpool) + 7) / 8;
 	else {
 		join = strcmp(channel_mode, "joint") == 0 ? 1 : 0;
-		len += ((join * subbands + blocks * bitpool)+7)/8;
+		len += ((join * subbands + blocks * bitpool) + 7) / 8;
 	}
 
 	return len;
@@ -127,7 +127,7 @@ static gboolean gst_rtp_sbc_pay_set_caps(GstBaseRTPPayload *payload,
 	GstRtpSBCPay *sbcpay;
 	gint rate, subbands, channels, blocks, bitpool;
 	gint frame_len;
-	const gchar* channel_mode;
+	const gchar *channel_mode;
 	GstStructure *structure;
 
 	sbcpay = GST_RTP_SBC_PAY(payload);
@@ -153,18 +153,18 @@ static gboolean gst_rtp_sbc_pay_set_caps(GstBaseRTPPayload *payload,
 
 	sbcpay->frame_length = frame_len;
 
-	gst_basertppayload_set_options (payload, "audio", TRUE, "SBC", rate);
+	gst_basertppayload_set_options(payload, "audio", TRUE, "SBC", rate);
 
 	GST_DEBUG_OBJECT(payload, "calculated frame length: %d ", frame_len);
 
-	return gst_basertppayload_set_outcaps (payload, NULL);
+	return gst_basertppayload_set_outcaps(payload, NULL);
 }
 
 static GstFlowReturn gst_rtp_sbc_pay_flush_buffers(GstRtpSBCPay *sbcpay)
 {
 	guint available;
 	guint max_payload;
-	GstBuffer* outbuf;
+	GstBuffer *outbuf;
 	guint8 *payload_data;
 	guint frame_count;
 	guint payload_length;
@@ -194,7 +194,7 @@ static GstFlowReturn gst_rtp_sbc_pay_flush_buffers(GstRtpSBCPay *sbcpay)
 			GST_BASE_RTP_PAYLOAD_PT(sbcpay));
 
 	payload_data = gst_rtp_buffer_get_payload(outbuf);
-	payload = (struct rtp_payload*) payload_data;
+	payload = (struct rtp_payload *) payload_data;
 	memset(payload, 0, sizeof(struct rtp_payload));
 	payload->frame_count = frame_count;
 
@@ -203,7 +203,7 @@ static GstFlowReturn gst_rtp_sbc_pay_flush_buffers(GstRtpSBCPay *sbcpay)
 	gst_adapter_flush(sbcpay->adapter, payload_length);
 
 	GST_BUFFER_TIMESTAMP(outbuf) = sbcpay->timestamp;
-	GST_DEBUG_OBJECT (sbcpay, "Pushing %d bytes", payload_length);
+	GST_DEBUG_OBJECT(sbcpay, "Pushing %d bytes", payload_length);
 
 	return gst_basertppayload_push(GST_BASE_RTP_PAYLOAD(sbcpay), outbuf);
 }
@@ -262,9 +262,9 @@ static void gst_rtp_sbc_pay_base_init(gpointer g_class)
 static void gst_rtp_sbc_pay_finalize(GObject *object)
 {
 	GstRtpSBCPay *sbcpay = GST_RTP_SBC_PAY(object);
-	g_object_unref (sbcpay->adapter);
+	g_object_unref(sbcpay->adapter);
 
-	GST_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
+	GST_CALL_PARENT(G_OBJECT_CLASS, finalize, (object));
 }
 
 static void gst_rtp_sbc_pay_class_init(GstRtpSBCPayClass *klass)
@@ -289,9 +289,9 @@ static void gst_rtp_sbc_pay_class_init(GstRtpSBCPayClass *klass)
 			gst_rtp_sbc_pay_handle_event);
 
 	/* properties */
-	g_object_class_install_property (G_OBJECT_CLASS (klass),
+	g_object_class_install_property(G_OBJECT_CLASS(klass),
 		PROP_MIN_FRAMES,
-		g_param_spec_int ("min-frames", "minimum frame number",
+		g_param_spec_int("min-frames", "minimum frame number",
 		"Minimum quantity of frames to send in one packet "
 		"(-1 for maximum allowed by the mtu)",
 		-1, G_MAXINT, DEFAULT_MIN_FRAMES, G_PARAM_READWRITE));
@@ -300,36 +300,36 @@ static void gst_rtp_sbc_pay_class_init(GstRtpSBCPayClass *klass)
 				"RTP SBC payloader");
 }
 
-static void gst_rtp_sbc_pay_set_property (GObject * object, guint prop_id,
-			const GValue * value, GParamSpec * pspec)
+static void gst_rtp_sbc_pay_set_property(GObject *object, guint prop_id,
+					const GValue *value, GParamSpec *pspec)
 {
 	GstRtpSBCPay *sbcpay;
 
-	sbcpay = GST_RTP_SBC_PAY (object);
+	sbcpay = GST_RTP_SBC_PAY(object);
 
 	switch (prop_id) {
 	case PROP_MIN_FRAMES:
 		sbcpay->min_frames = g_value_get_int(value);
 		break;
 	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
 	break;
 	}
 }
 
-static void gst_rtp_sbc_pay_get_property (GObject * object, guint prop_id,
-                        GValue * value, GParamSpec * pspec)
+static void gst_rtp_sbc_pay_get_property(GObject *object, guint prop_id,
+					GValue *value, GParamSpec *pspec)
 {
 	GstRtpSBCPay *sbcpay;
 
-	sbcpay = GST_RTP_SBC_PAY (object);
+	sbcpay = GST_RTP_SBC_PAY(object);
 
 	switch (prop_id) {
 	case PROP_MIN_FRAMES:
 		g_value_set_int(value, sbcpay->min_frames);
 		break;
 	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
 	break;
 	}
 }
@@ -343,9 +343,9 @@ static void gst_rtp_sbc_pay_init(GstRtpSBCPay *self, GstRtpSBCPayClass *klass)
 	self->min_frames = DEFAULT_MIN_FRAMES;
 }
 
-gboolean gst_rtp_sbc_pay_plugin_init (GstPlugin * plugin)
+gboolean gst_rtp_sbc_pay_plugin_init(GstPlugin *plugin)
 {
-	return gst_element_register (plugin, "rtpsbcpay",
-			GST_RANK_NONE, GST_TYPE_RTP_SBC_PAY);
+	return gst_element_register(plugin, "rtpsbcpay", GST_RANK_NONE,
+							GST_TYPE_RTP_SBC_PAY);
 }
 
diff --git a/audio/gstsbcdec.c b/audio/gstsbcdec.c
index 43a40f44..a53d93c3 100644
--- a/audio/gstsbcdec.c
+++ b/audio/gstsbcdec.c
@@ -214,10 +214,10 @@ static void gst_sbc_dec_init(GstSbcDec *self, GstSbcDecClass *klass)
 	self->outcaps = NULL;
 }
 
-gboolean gst_sbc_dec_plugin_init (GstPlugin * plugin)
+gboolean gst_sbc_dec_plugin_init(GstPlugin *plugin)
 {
-	return gst_element_register (plugin, "sbcdec",
-			GST_RANK_PRIMARY, GST_TYPE_SBC_DEC);
+	return gst_element_register(plugin, "sbcdec", GST_RANK_PRIMARY,
+							GST_TYPE_SBC_DEC);
 }
 
 
diff --git a/audio/gstsbcenc.c b/audio/gstsbcenc.c
index 65e3da5b..1a5daaa1 100644
--- a/audio/gstsbcenc.c
+++ b/audio/gstsbcenc.c
@@ -166,9 +166,9 @@ static GstStaticPadTemplate sbc_enc_src_factory =
 
 gboolean gst_sbc_enc_fill_sbc_params(GstSbcEnc *enc, GstCaps *caps);
 
-static GstCaps* sbc_enc_generate_srcpad_caps(GstSbcEnc *enc)
+static GstCaps *sbc_enc_generate_srcpad_caps(GstSbcEnc *enc)
 {
-	GstCaps* src_caps;
+	GstCaps *src_caps;
 	GstStructure *structure;
 	GEnumValue *enum_value;
 	GEnumClass *enum_class;
@@ -220,7 +220,7 @@ static GstCaps* sbc_enc_generate_srcpad_caps(GstSbcEnc *enc)
 	return src_caps;
 }
 
-static GstCaps* sbc_enc_src_getcaps (GstPad * pad)
+static GstCaps *sbc_enc_src_getcaps(GstPad *pad)
 {
 	GstSbcEnc *enc;
 
@@ -229,7 +229,7 @@ static GstCaps* sbc_enc_src_getcaps (GstPad * pad)
 	return sbc_enc_generate_srcpad_caps(enc);
 }
 
-static gboolean sbc_enc_src_setcaps (GstPad *pad, GstCaps *caps)
+static gboolean sbc_enc_src_setcaps(GstPad *pad, GstCaps *caps)
 {
 	GstSbcEnc *enc = GST_SBC_ENC(GST_PAD_PARENT(pad));
 
@@ -238,15 +238,15 @@ static gboolean sbc_enc_src_setcaps (GstPad *pad, GstCaps *caps)
 	return gst_sbc_enc_fill_sbc_params(enc, caps);
 }
 
-static GstCaps* sbc_enc_src_caps_fixate(GstSbcEnc *enc, GstCaps *caps)
+static GstCaps *sbc_enc_src_caps_fixate(GstSbcEnc *enc, GstCaps *caps)
 {
 	gchar *error_message = NULL;
-	GstCaps* result;
+	GstCaps *result;
 
 	result = gst_sbc_util_caps_fixate(caps, &error_message);
 
 	if (!result) {
-		GST_WARNING_OBJECT (enc, "Invalid input caps caused parsing "
+		GST_WARNING_OBJECT(enc, "Invalid input caps caused parsing "
 				"error: %s", error_message);
 		g_free(error_message);
 		return NULL;
@@ -255,7 +255,7 @@ static GstCaps* sbc_enc_src_caps_fixate(GstSbcEnc *enc, GstCaps *caps)
 	return result;
 }
 
-static GstCaps* sbc_enc_get_fixed_srcpad_caps(GstSbcEnc *enc)
+static GstCaps *sbc_enc_get_fixed_srcpad_caps(GstSbcEnc *enc)
 {
 	GstCaps *caps;
 	gboolean res = TRUE;
@@ -281,7 +281,7 @@ done:
 	return result_caps;
 }
 
-static gboolean sbc_enc_sink_setcaps (GstPad * pad, GstCaps * caps)
+static gboolean sbc_enc_sink_setcaps(GstPad *pad, GstCaps *caps)
 {
 	GstSbcEnc *enc;
 	GstStructure *structure;
@@ -289,7 +289,7 @@ static gboolean sbc_enc_sink_setcaps (GstPad * pad, GstCaps * caps)
 	gint rate, channels;
 	gboolean res;
 
-	enc = GST_SBC_ENC(GST_PAD_PARENT (pad));
+	enc = GST_SBC_ENC(GST_PAD_PARENT(pad));
 	structure = gst_caps_get_structure(caps, 0);
 
 	if (!gst_structure_get_int(structure, "rate", &rate))
@@ -392,7 +392,7 @@ static GstFlowReturn sbc_enc_chain(GstPad *pad, GstBuffer *buffer)
 					GST_BUFFER_DATA(output),
 					GST_BUFFER_SIZE(output), NULL);
 		if (consumed <= 0) {
-			GST_DEBUG_OBJECT (enc, "comsumed < 0, codesize: %d",
+			GST_DEBUG_OBJECT(enc, "comsumed < 0, codesize: %d",
 					enc->codesize);
 			break;
 		}
@@ -442,7 +442,7 @@ static void gst_sbc_enc_dispose(GObject *object)
 	GstSbcEnc *enc = GST_SBC_ENC(object);
 
 	if (enc->adapter != NULL)
-		g_object_unref (G_OBJECT (enc->adapter));
+		g_object_unref(G_OBJECT(enc->adapter));
 
 	enc->adapter = NULL;
 }
@@ -564,8 +564,8 @@ static void gst_sbc_enc_init(GstSbcEnc *self, GstSbcEncClass *klass)
 {
 	self->sinkpad = gst_pad_new_from_static_template(
 		&sbc_enc_sink_factory, "sink");
-	gst_pad_set_setcaps_function (self->sinkpad,
-			GST_DEBUG_FUNCPTR (sbc_enc_sink_setcaps));
+	gst_pad_set_setcaps_function(self->sinkpad,
+			GST_DEBUG_FUNCPTR(sbc_enc_sink_setcaps));
 	gst_element_add_pad(GST_ELEMENT(self), self->sinkpad);
 
 	self->srcpad = gst_pad_new_from_static_template(
@@ -593,9 +593,9 @@ static void gst_sbc_enc_init(GstSbcEnc *self, GstSbcEncClass *klass)
 	self->adapter = gst_adapter_new();
 }
 
-gboolean gst_sbc_enc_plugin_init (GstPlugin * plugin)
+gboolean gst_sbc_enc_plugin_init(GstPlugin *plugin)
 {
-	return gst_element_register (plugin, "sbcenc",
+	return gst_element_register(plugin, "sbcenc",
 			GST_RANK_NONE, GST_TYPE_SBC_ENC);
 }
 
diff --git a/audio/gstsbcparse.c b/audio/gstsbcparse.c
index 4521c563..72d36ce7 100644
--- a/audio/gstsbcparse.c
+++ b/audio/gstsbcparse.c
@@ -214,9 +214,9 @@ static void gst_sbc_parse_init(GstSbcParse *self, GstSbcParseClass *klass)
 	self->first_parsing = TRUE;
 }
 
-gboolean gst_sbc_parse_plugin_init (GstPlugin * plugin)
+gboolean gst_sbc_parse_plugin_init(GstPlugin *plugin)
 {
-	return gst_element_register (plugin, "sbcparse",
-			GST_RANK_NONE, GST_TYPE_SBC_PARSE);
+	return gst_element_register(plugin, "sbcparse", GST_RANK_NONE,
+							GST_TYPE_SBC_PARSE);
 }
 
diff --git a/audio/gstsbcutil.c b/audio/gstsbcutil.c
index 5d646cfb..ec7a52d3 100644
--- a/audio/gstsbcutil.c
+++ b/audio/gstsbcutil.c
@@ -285,7 +285,7 @@ gint gst_sbc_parse_allocation_to_sbc(const gchar *allocation)
 		return SBC_AM_LOUDNESS;
 }
 
-GstCaps* gst_sbc_parse_caps_from_sbc(sbc_t *sbc)
+GstCaps *gst_sbc_parse_caps_from_sbc(sbc_t *sbc)
 {
 	GstCaps *caps;
 	const gchar *mode_str;
@@ -318,15 +318,15 @@ GstCaps* gst_sbc_parse_caps_from_sbc(sbc_t *sbc)
  * error_message must be passed NULL, if an error occurs, the caller has the
  * ownership of the error_message, it must be freed after use.
  */
-GstCaps* gst_sbc_util_caps_fixate(GstCaps *caps, gchar** error_message)
+GstCaps *gst_sbc_util_caps_fixate(GstCaps *caps, gchar **error_message)
 {
 	GstCaps *result;
 	GstStructure *structure;
 	const GValue *value;
 	gboolean error = FALSE;
 	gint temp, rate, channels, blocks, subbands, bitpool;
-	const gchar* allocation = NULL;
-	const gchar* mode = NULL;
+	const gchar *allocation = NULL;
+	const gchar *mode = NULL;
 
 	g_assert(*error_message == NULL);
 
@@ -455,7 +455,7 @@ error:
  * GValue, it will be left unitialized at the end of the function.
  */
 void gst_sbc_util_set_structure_int_param(GstStructure *structure,
-			const gchar* field, gint field_value,
+			const gchar *field, gint field_value,
 			GValue *value)
 {
 	value = g_value_init(value, G_TYPE_INT);
@@ -470,7 +470,7 @@ void gst_sbc_util_set_structure_int_param(GstStructure *structure,
  * GValue, it will be left unitialized at the end of the function.
  */
 void gst_sbc_util_set_structure_string_param(GstStructure *structure,
-			const gchar* field, const gchar* field_value,
+			const gchar *field, const gchar *field_value,
 			GValue *value)
 {
 	value = g_value_init(value, G_TYPE_STRING);
@@ -483,8 +483,8 @@ gboolean gst_sbc_util_fill_sbc_params(sbc_t *sbc, GstCaps *caps)
 {
 	GstStructure *structure;
 	gint rate, channels, subbands, blocks, bitpool;
-	const gchar* mode;
-	const gchar* allocation;
+	const gchar *mode;
+	const gchar *allocation;
 
 	g_assert(gst_caps_is_fixed(caps));
 
diff --git a/audio/pcm_bluetooth.c b/audio/pcm_bluetooth.c
index 244d08d1..c60b752f 100644
--- a/audio/pcm_bluetooth.c
+++ b/audio/pcm_bluetooth.c
@@ -141,7 +141,7 @@ struct bluetooth_data {
 	pthread_t hw_thread;				/* Makes virtual hw pointer move */
 	int pipefd[2];					/* Inter thread communication */
 	int stopped;
-	sig_atomic_t reset;             /* Request XRUN handling */
+	sig_atomic_t reset;				/* Request XRUN handling */
 };
 
 static int audioservice_send(int sk, const bt_audio_msg_header_t *msg);
@@ -333,9 +333,9 @@ static int bluetooth_prepare(snd_pcm_ioplug_t *io)
 	struct bluetooth_data *data = io->private_data;
 	char c = 'w';
 	char buf[BT_SUGGESTED_BUFFER_SIZE];
-	struct bt_start_stream_req *req = (void*) buf;
-	struct bt_start_stream_rsp *rsp = (void*) buf;
-	struct bt_new_stream_ind *ind = (void*) buf;
+	struct bt_start_stream_req *req = (void *) buf;
+	struct bt_start_stream_rsp *rsp = (void *) buf;
+	struct bt_new_stream_ind *ind = (void *) buf;
 	uint32_t period_count = io->buffer_size / io->period_size;
 	int opt_name, err;
 	struct timeval t = { 0, period_count };
@@ -430,8 +430,8 @@ static int bluetooth_hsp_hw_params(snd_pcm_ioplug_t *io,
 {
 	struct bluetooth_data *data = io->private_data;
 	char buf[BT_SUGGESTED_BUFFER_SIZE];
-	struct bt_set_configuration_req *req = (void*) buf;
-	struct bt_set_configuration_rsp *rsp = (void*) buf;
+	struct bt_set_configuration_req *req = (void *) buf;
+	struct bt_set_configuration_rsp *rsp = (void *) buf;
 	int err;
 
 	DBG("Preparing with io->period_size=%lu io->buffer_size=%lu",
@@ -671,8 +671,8 @@ static int bluetooth_a2dp_hw_params(snd_pcm_ioplug_t *io,
 	struct bluetooth_data *data = io->private_data;
 	struct bluetooth_a2dp *a2dp = &data->a2dp;
 	char buf[BT_SUGGESTED_BUFFER_SIZE];
-	struct bt_set_configuration_req *req = (void*) buf;
-	struct bt_set_configuration_rsp *rsp = (void*) buf;
+	struct bt_set_configuration_req *req = (void *) buf;
+	struct bt_set_configuration_rsp *rsp = (void *) buf;
 	int err;
 
 	DBG("Preparing with io->period_size=%lu io->buffer_size=%lu",
@@ -1283,8 +1283,9 @@ static int bluetooth_a2dp_hw_constraint(snd_pcm_ioplug_t *io)
 
 	/* supported buffer sizes
 	 * (can be used as 3*8192, 6*4096, 12*2048, ...) */
-	err = snd_pcm_ioplug_set_param_minmax(io, SND_PCM_IOPLUG_HW_BUFFER_BYTES,
-					      8192*3, 8192*3);
+	err = snd_pcm_ioplug_set_param_minmax(io,
+						SND_PCM_IOPLUG_HW_BUFFER_BYTES,
+						8192*3, 8192*3);
 	if (err < 0)
 		return err;
 
@@ -1598,8 +1599,8 @@ static int bluetooth_init(struct bluetooth_data *data, snd_pcm_stream_t stream,
 	int sk, err;
 	struct bluetooth_alsa_config *alsa_conf = &data->alsa_config;
 	char buf[BT_SUGGESTED_BUFFER_SIZE];
-	struct bt_get_capabilities_req *req = (void*) buf;
-	struct bt_get_capabilities_rsp *rsp = (void*) buf;
+	struct bt_get_capabilities_req *req = (void *) buf;
+	struct bt_get_capabilities_rsp *rsp = (void *) buf;
 
 	memset(data, 0, sizeof(struct bluetooth_data));
 
diff --git a/audio/telephony-maemo.c b/audio/telephony-maemo.c
index 7a8e9d30..9bbf09be 100644
--- a/audio/telephony-maemo.c
+++ b/audio/telephony-maemo.c
@@ -233,7 +233,7 @@ static struct csd_call *find_call(const char *path)
 {
 	GSList *l;
 
-	for (l = calls ; l != NULL; l = l->next) {
+	for (l = calls; l != NULL; l = l->next) {
 		struct csd_call *call = l->data;
 
 		if (g_str_equal(call->object_path, path))
@@ -247,7 +247,7 @@ static struct csd_call *find_active_call(void)
 {
 	GSList *l;
 
-	for (l = calls ; l != NULL; l = l->next) {
+	for (l = calls; l != NULL; l = l->next) {
 		struct csd_call *call = l->data;
 
 		if (call->status != CSD_CALL_STATUS_IDLE)
@@ -261,7 +261,7 @@ static struct csd_call *find_call_with_status(int status)
 {
 	GSList *l;
 
-	for (l = calls ; l != NULL; l = l->next) {
+	for (l = calls; l != NULL; l = l->next) {
 		struct csd_call *call = l->data;
 
 		if (call->status == status)
@@ -277,7 +277,7 @@ static gboolean update_indicators(gpointer user_data)
 		int signal;
 		telephony_update_indicator(maemo_indicators, "service",
 						EV_SERVICE_PRESENT);
-	        signal = telephony_get_indicator(maemo_indicators, "signal");
+		signal = telephony_get_indicator(maemo_indicators, "signal");
 		telephony_update_indicator(maemo_indicators, "signal", signal);
 	} else
 		telephony_update_indicator(maemo_indicators, "service",
@@ -296,7 +296,7 @@ static gboolean update_indicators(gpointer user_data)
 	}
 
 	if ((battchg_last > 0 || battchg_design > 0) && battchg_cur >= 0) {
-	        int bat = telephony_get_indicator(maemo_indicators, "battchg");
+		int bat = telephony_get_indicator(maemo_indicators, "battchg");
 		telephony_update_indicator(maemo_indicators, "battchg", bat);
 	}
 
@@ -589,10 +589,10 @@ void telephony_transmit_dtmf_req(void *telephony_device, char tone)
 	debug("telephony-maemo: transmit dtmf: %s", buf);
 
 	ret = send_method_call(CSD_CALL_BUS_NAME, CSD_CALL_PATH,
-				   CSD_CALL_INTERFACE, "SendDTMF",
-				   NULL, NULL,
-				   DBUS_TYPE_STRING, &buf_ptr,
-				   DBUS_TYPE_INVALID);
+				CSD_CALL_INTERFACE, "SendDTMF",
+				NULL, NULL,
+				DBUS_TYPE_STRING, &buf_ptr,
+				DBUS_TYPE_INVALID);
 	if (ret < 0) {
 		telephony_transmit_dtmf_rsp(telephony_device,
 						CME_ERROR_AG_FAILURE);
@@ -722,9 +722,9 @@ void telephony_call_hold_req(void *telephony_device, const char *cmd)
 		break;
 	case '1':
 		if (idx) {
-		       if (call)
-			       err = release_call(call);
-		       break;
+			if (call)
+				err = release_call(call);
+			break;
 		}
 		foreach_call_with_status(CSD_CALL_STATUS_ACTIVE, release_call);
 		call = find_call_with_status(CSD_CALL_STATUS_WAITING);
@@ -1205,7 +1205,7 @@ static void hal_battery_level_reply(DBusPendingCall *call, void *user_data)
 		else
 			max = battchg_design;
 
-	        cur = telephony_get_indicator(maemo_indicators, "battchg");
+		cur = telephony_get_indicator(maemo_indicators, "battchg");
 		new = battchg_cur * 5 / max;
 
 		if (new != cur)