1 files changed, 196 insertions, 174 deletions

diff --git a/src/audioOutputs/audioOutput_shout.c b/src/audioOutputs/audioOutput_shout.c
index 6fb40ea7b..ab5a9b54c 100644
--- a/src/audioOutputs/audioOutput_shout.c
+++ b/src/audioOutputs/audioOutput_shout.c
@@ -42,7 +42,7 @@ static int shoutInitCount = 0;
 /* lots of this code blatantly stolent from bossogg/bossao2 */
 
 typedef struct _ShoutData {
-	shout_t * shoutConn;
+	shout_t *shoutConn;
 	int shoutError;
 
 	ogg_stream_state os;
@@ -51,7 +51,7 @@ typedef struct _ShoutData {
 	ogg_packet header_main;
 	ogg_packet header_comments;
 	ogg_packet header_codebooks;
-	
+
 	vorbis_dsp_state vd;
 	vorbis_block vb;
 	vorbis_info vi;
@@ -62,18 +62,19 @@ typedef struct _ShoutData {
 
 	int opened;
 
-	MpdTag * tag;
+	MpdTag *tag;
 	int tagToSend;
 
 	int connAttempts;
 	time_t lastAttempt;
 
 	/* just a pointer to audioOutput->outAudioFormat */
-	AudioFormat * audioFormat;
+	AudioFormat *audioFormat;
 } ShoutData;
 
-static ShoutData * newShoutData(void) {
-	ShoutData * ret = malloc(sizeof(ShoutData));
+static ShoutData *newShoutData(void)
+{
+	ShoutData *ret = malloc(sizeof(ShoutData));
 
 	ret->shoutConn = shout_new();
 	ret->opened = 0;
@@ -88,9 +89,12 @@ static ShoutData * newShoutData(void) {
 	return ret;
 }
 
-static void freeShoutData(ShoutData * sd) {
-	if(sd->shoutConn) shout_free(sd->shoutConn);
-	if(sd->tag) freeMpdTag(sd->tag);
+static void freeShoutData(ShoutData * sd)
+{
+	if (sd->shoutConn)
+		shout_free(sd->shoutConn);
+	if (sd->tag)
+		freeMpdTag(sd->tag);
 
 	free(sd);
 }
@@ -104,21 +108,23 @@ static void freeShoutData(ShoutData * sd) {
 	} \
 }
 
-static int myShout_initDriver(AudioOutput * audioOutput, ConfigParam * param) {
-	ShoutData * sd;
-	char * test;
+static int myShout_initDriver(AudioOutput * audioOutput, ConfigParam * param)
+{
+	ShoutData *sd;
+	char *test;
 	int port;
-	char * host;
-	char * mount;
-	char * passwd;
-	char * user;
-	char * name;
-	BlockParam * blockParam;
+	char *host;
+	char *mount;
+	char *passwd;
+	char *user;
+	char *name;
+	BlockParam *blockParam;
 	unsigned int public;
 
 	sd = newShoutData();
 
-	if(shoutInitCount == 0) shout_init();
+	if (shoutInitCount == 0)
+		shout_init();
 
 	shoutInitCount++;
 
@@ -132,9 +138,9 @@ static int myShout_initDriver(AudioOutput * audioOutput, ConfigParam * param) {
 
 	port = strtol(blockParam->value, &test, 10);
 
-	if(*test != '\0' || port <= 0) {
-		ERROR("shout port \"%s\" is not a positive integer, line %i\n", 
-				blockParam->value, blockParam->line);
+	if (*test != '\0' || port <= 0) {
+		ERROR("shout port \"%s\" is not a positive integer, line %i\n",
+		      blockParam->value, blockParam->line);
 		exit(EXIT_FAILURE);
 	}
 
@@ -145,58 +151,61 @@ static int myShout_initDriver(AudioOutput * audioOutput, ConfigParam * param) {
 	name = blockParam->value;
 
 	blockParam = getBlockParam(param, "public");
-	if(blockParam) {
-		if(0 == strcmp(blockParam->value, "yes")) public = 1;
-		else if(0 == strcmp(blockParam->value, "no")) public = 0;
+	if (blockParam) {
+		if (0 == strcmp(blockParam->value, "yes"))
+			public = 1;
+		else if (0 == strcmp(blockParam->value, "no"))
+			public = 0;
 		else {
 			ERROR("public \"%s\" is not \"yes\" or \"no\" at line "
-				"%i\n", param->value, param->line);
+			      "%i\n", param->value, param->line);
 			exit(EXIT_FAILURE);
 		}
-	}
-	else public = 0;
+	} else
+		public = 0;
 
 	blockParam = getBlockParam(param, "user");
-	if(blockParam) user = blockParam->value;
-	else user = "source";
+	if (blockParam)
+		user = blockParam->value;
+	else
+		user = "source";
 
 	blockParam = getBlockParam(param, "quality");
 
-	if(blockParam) {
+	if (blockParam) {
 		int line = blockParam->line;
 
 		sd->quality = strtod(blockParam->value, &test);
 
-		if(*test != '\0' || sd->quality < 0.0 || sd->quality > 10.0) {
+		if (*test != '\0' || sd->quality < 0.0 || sd->quality > 10.0) {
 			ERROR("shout quality \"%s\" is not a number in the "
-				"range 0-10, line %i\n", blockParam->value,
-				blockParam->line);
+			      "range 0-10, line %i\n", blockParam->value,
+			      blockParam->line);
 			exit(EXIT_FAILURE);
 		}
 
 		blockParam = getBlockParam(param, "bitrate");
 
-		if(blockParam) {
+		if (blockParam) {
 			ERROR("quality (line %i) and bitrate (line %i) are "
-				"both defined for shout output\n", line,
-				blockParam->line);
+			      "both defined for shout output\n", line,
+			      blockParam->line);
 			exit(EXIT_FAILURE);
 		}
-	}
-	else {
+	} else {
 		blockParam = getBlockParam(param, "bitrate");
 
-		if(!blockParam) {
+		if (!blockParam) {
 			ERROR("neither bitrate nor quality defined for shout "
-				"output at line %i\n", param->line);
+			      "output at line %i\n", param->line);
 			exit(EXIT_FAILURE);
 		}
 
 		sd->bitrate = strtol(blockParam->value, &test, 10);
 
-		if(*test != '\0' || sd->bitrate <= 0) {
+		if (*test != '\0' || sd->bitrate <= 0) {
 			ERROR("bitrate at line %i should be a positive integer "
-				"\n", blockParam->line);
+			      "\n", blockParam->line);
 			exit(EXIT_FAILURE);
 		}
 	}
@@ -204,64 +213,58 @@ static int myShout_initDriver(AudioOutput * audioOutput, ConfigParam * param) {
 	checkBlockParam("format");
 	sd->audioFormat = &audioOutput->outAudioFormat;
 
-	if(shout_set_host(sd->shoutConn, host) !=  SHOUTERR_SUCCESS ||
-		shout_set_port(sd->shoutConn, port) != SHOUTERR_SUCCESS ||
-		shout_set_password(sd->shoutConn, passwd) != SHOUTERR_SUCCESS ||
-		shout_set_mount(sd->shoutConn, mount) != SHOUTERR_SUCCESS ||
-		shout_set_name(sd->shoutConn, name) != SHOUTERR_SUCCESS ||
-		shout_set_user(sd->shoutConn, user) != SHOUTERR_SUCCESS ||
-		shout_set_public(sd->shoutConn, public) != SHOUTERR_SUCCESS ||
-		shout_set_format(sd->shoutConn, SHOUT_FORMAT_VORBIS) 
-			!= SHOUTERR_SUCCESS ||
-		shout_set_protocol(sd->shoutConn, SHOUT_PROTOCOL_HTTP)
-			!= SHOUTERR_SUCCESS ||
-		shout_set_agent(sd->shoutConn, "MPD") != SHOUTERR_SUCCESS)
-	{
+	if (shout_set_host(sd->shoutConn, host) != SHOUTERR_SUCCESS ||
+	    shout_set_port(sd->shoutConn, port) != SHOUTERR_SUCCESS ||
+	    shout_set_password(sd->shoutConn, passwd) != SHOUTERR_SUCCESS ||
+	    shout_set_mount(sd->shoutConn, mount) != SHOUTERR_SUCCESS ||
+	    shout_set_name(sd->shoutConn, name) != SHOUTERR_SUCCESS ||
+	    shout_set_user(sd->shoutConn, user) != SHOUTERR_SUCCESS ||
+	    shout_set_public(sd->shoutConn, public) != SHOUTERR_SUCCESS ||
+	    shout_set_format(sd->shoutConn, SHOUT_FORMAT_VORBIS)
+	    != SHOUTERR_SUCCESS ||
+	    shout_set_protocol(sd->shoutConn, SHOUT_PROTOCOL_HTTP)
+	    != SHOUTERR_SUCCESS ||
+	    shout_set_agent(sd->shoutConn, "MPD") != SHOUTERR_SUCCESS) {
 		ERROR("error configuring shout defined at line %i: %s\n",
-				param->line,
-				shout_get_error(sd->shoutConn));
+		      param->line, shout_get_error(sd->shoutConn));
 		exit(EXIT_FAILURE);
 	}
 
 	/* optional paramters */
 	blockParam = getBlockParam(param, "genre");
-	if(blockParam && shout_set_genre(sd->shoutConn, blockParam->value)) {
+	if (blockParam && shout_set_genre(sd->shoutConn, blockParam->value)) {
 		ERROR("error configuring shout defined at line %i: %s\n",
-				param->line,
-				shout_get_error(sd->shoutConn));
+		      param->line, shout_get_error(sd->shoutConn));
 		exit(EXIT_FAILURE);
 	}
 
 	blockParam = getBlockParam(param, "description");
-	if(blockParam && shout_set_description(sd->shoutConn, 
-				blockParam->value)) 
-	{
+	if (blockParam && shout_set_description(sd->shoutConn,
+						blockParam->value)) {
 		ERROR("error configuring shout defined at line %i: %s\n",
-				param->line,
-				shout_get_error(sd->shoutConn));
+		      param->line, shout_get_error(sd->shoutConn));
 		exit(EXIT_FAILURE);
 	}
 
 	{
 		char temp[11];
 		memset(temp, 0, sizeof(temp));
-	
+
 		snprintf(temp, sizeof(temp), "%d", sd->audioFormat->channels);
 		shout_set_audio_info(sd->shoutConn, SHOUT_AI_CHANNELS, temp);
 
 		snprintf(temp, sizeof(temp), "%d", sd->audioFormat->sampleRate);
-				
+
 		shout_set_audio_info(sd->shoutConn, SHOUT_AI_SAMPLERATE, temp);
 
-		if(sd->quality >= 0) {
+		if (sd->quality >= 0) {
 			snprintf(temp, sizeof(temp), "%2.2f", sd->quality);
 			shout_set_audio_info(sd->shoutConn, SHOUT_AI_QUALITY,
-					temp);
-		}
-		else {
+					     temp);
+		} else {
 			snprintf(temp, sizeof(temp), "%d", sd->bitrate);
 			shout_set_audio_info(sd->shoutConn, SHOUT_AI_BITRATE,
-					temp);
+					     temp);
 		}
 	}
 
@@ -270,23 +273,24 @@ static int myShout_initDriver(AudioOutput * audioOutput, ConfigParam * param) {
 	return 0;
 }
 
-static int myShout_handleError(ShoutData * sd, int err) {
-	switch(err) {
+static int myShout_handleError(ShoutData * sd, int err)
+{
+	switch (err) {
 	case SHOUTERR_SUCCESS:
 		break;
 	case SHOUTERR_UNCONNECTED:
 	case SHOUTERR_SOCKET:
-		ERROR("Lost shout connection to %s:%i : %s\n", 
-				shout_get_host(sd->shoutConn),
-				shout_get_port(sd->shoutConn),
-				shout_get_error(sd->shoutConn));
+		ERROR("Lost shout connection to %s:%i : %s\n",
+		      shout_get_host(sd->shoutConn),
+		      shout_get_port(sd->shoutConn),
+		      shout_get_error(sd->shoutConn));
 		sd->shoutError = 1;
 		return -1;
 	default:
-		ERROR("shout: connection to %s:%i error : %s\n", 
-				shout_get_host(sd->shoutConn),
-				shout_get_port(sd->shoutConn),
-				shout_get_error(sd->shoutConn));
+		ERROR("shout: connection to %s:%i error : %s\n",
+		      shout_get_host(sd->shoutConn),
+		      shout_get_port(sd->shoutConn),
+		      shout_get_error(sd->shoutConn));
 		sd->shoutError = 1;
 		return -1;
 	}
@@ -294,39 +298,46 @@ static int myShout_handleError(ShoutData * sd, int err) {
 	return 0;
 }
 
-static int write_page(ShoutData * sd) {
+static int write_page(ShoutData * sd)
+{
 	int err = 0;
 
-	/*DEBUG("shout_delay: %i\n", shout_delay(sd->shoutConn));*/
+	/*DEBUG("shout_delay: %i\n", shout_delay(sd->shoutConn)); */
 	shout_sync(sd->shoutConn);
 	err = shout_send(sd->shoutConn, sd->og.header, sd->og.header_len);
-	if(myShout_handleError(sd, err) < 0) return -1;
+	if (myShout_handleError(sd, err) < 0)
+		return -1;
 	err = shout_send(sd->shoutConn, sd->og.body, sd->og.body_len);
-	if(myShout_handleError(sd, err) < 0) return -1;
+	if (myShout_handleError(sd, err) < 0)
+		return -1;
 
 	return 0;
 }
 
-static void finishEncoder(ShoutData * sd) {
+static void finishEncoder(ShoutData * sd)
+{
 	vorbis_analysis_wrote(&sd->vd, 0);
 
-	while(vorbis_analysis_blockout(&sd->vd, &sd->vb) == 1) {
+	while (vorbis_analysis_blockout(&sd->vd, &sd->vb) == 1) {
 		vorbis_analysis(&sd->vb, NULL);
 		vorbis_bitrate_addblock(&sd->vb);
-		while(vorbis_bitrate_flushpacket(&sd->vd, &sd->op)) {
+		while (vorbis_bitrate_flushpacket(&sd->vd, &sd->op)) {
 			ogg_stream_packetin(&sd->os, &sd->op);
 		}
 	}
 }
 
-static int flushEncoder(ShoutData * sd) {
+static int flushEncoder(ShoutData * sd)
+{
 	return (ogg_stream_pageout(&sd->os, &sd->og) > 0);
 }
 
-static void clearEncoder(ShoutData * sd) {
+static void clearEncoder(ShoutData * sd)
+{
 	finishEncoder(sd);
-	while(1 == flushEncoder(sd)) {
-		if(!sd->shoutError) write_page(sd);
+	while (1 == flushEncoder(sd)) {
+		if (!sd->shoutError)
+			write_page(sd);
 	}
 
 	vorbis_comment_clear(&sd->vc);
@@ -336,21 +347,23 @@ static void clearEncoder(ShoutData * sd) {
 	vorbis_info_clear(&sd->vi);
 }
 
-static void myShout_closeShoutConn(ShoutData * sd) {
-	if(sd->opened) {
+static void myShout_closeShoutConn(ShoutData * sd)
+{
+	if (sd->opened) {
 		clearEncoder(sd);
 
-		if(shout_close(sd->shoutConn) != SHOUTERR_SUCCESS) {
+		if (shout_close(sd->shoutConn) != SHOUTERR_SUCCESS) {
 			ERROR("problem closing connection to shout server: "
-				"%s\n", shout_get_error(sd->shoutConn));
+			      "%s\n", shout_get_error(sd->shoutConn));
 		}
 	}
 
 	sd->opened = 0;
 }
 
-static void myShout_finishDriver(AudioOutput * audioOutput) {
-	ShoutData * sd = (ShoutData *)audioOutput->data;
+static void myShout_finishDriver(AudioOutput * audioOutput)
+{
+	ShoutData *sd = (ShoutData *) audioOutput->data;
 
 	myShout_closeShoutConn(sd);
 
@@ -358,15 +371,18 @@ static void myShout_finishDriver(AudioOutput * audioOutput) {
 
 	shoutInitCount--;
 
-	if(shoutInitCount == 0) shout_shutdown();
+	if (shoutInitCount == 0)
+		shout_shutdown();
 }
 
-static void myShout_dropBufferedAudio(AudioOutput * audioOutput) {
+static void myShout_dropBufferedAudio(AudioOutput * audioOutput)
+{
 	/* needs to be implemented */
 }
 
-static void myShout_closeDevice(AudioOutput * audioOutput) {
-	ShoutData * sd = (ShoutData *)audioOutput->data;
+static void myShout_closeDevice(AudioOutput * audioOutput)
+{
+	ShoutData *sd = (ShoutData *) audioOutput->data;
 
 	myShout_closeShoutConn(sd);
 
@@ -377,12 +393,13 @@ static void myShout_closeDevice(AudioOutput * audioOutput) {
 	if(value) vorbis_comment_add_tag(&(sd->vc), name, value); \
 }
 
-static void copyTagToVorbisComment(ShoutData * sd) {
-	if(sd->tag) {
+static void copyTagToVorbisComment(ShoutData * sd)
+{
+	if (sd->tag) {
 		int i;
 
-		for(i = 0; i < sd->tag->numOfItems; i++) {
-			switch(sd->tag->items[i].type) {
+		for (i = 0; i < sd->tag->numOfItems; i++) {
+			switch (sd->tag->items[i].type) {
 			case TAG_ITEM_ARTIST:
 				addTag("ARTIST", sd->tag->items[i].value);
 				break;
@@ -397,25 +414,24 @@ static void copyTagToVorbisComment(ShoutData * sd) {
 	}
 }
 
-static int initEncoder(ShoutData * sd) {
+static int initEncoder(ShoutData * sd)
+{
 	vorbis_info_init(&(sd->vi));
 
-	if(sd->quality >= 0) {
-		if( 0 != vorbis_encode_init_vbr(&(sd->vi),
-			sd->audioFormat->channels, 
-			sd->audioFormat->sampleRate, sd->quality*0.1) )
-		{
+	if (sd->quality >= 0) {
+		if (0 != vorbis_encode_init_vbr(&(sd->vi),
+						sd->audioFormat->channels,
+						sd->audioFormat->sampleRate,
+						sd->quality * 0.1)) {
 			ERROR("problem seting up vorbis encoder for shout\n");
 			vorbis_info_clear(&(sd->vi));
 			return -1;
 		}
-	}
-	else {
-		if( 0 != vorbis_encode_init(&(sd->vi), 
-			sd->audioFormat->channels, 
-			sd->audioFormat->sampleRate, -1.0,
-			sd->bitrate*1000, -1.0) )
-		{
+	} else {
+		if (0 != vorbis_encode_init(&(sd->vi),
+					    sd->audioFormat->channels,
+					    sd->audioFormat->sampleRate, -1.0,
+					    sd->bitrate * 1000, -1.0)) {
 			ERROR("problem seting up vorbis encoder for shout\n");
 			vorbis_info_clear(&(sd->vi));
 			return -1;
@@ -423,7 +439,7 @@ static int initEncoder(ShoutData * sd) {
 	}
 
 	vorbis_analysis_init(&(sd->vd), &(sd->vi));
-	vorbis_block_init (&(sd->vd), &(sd->vb));
+	vorbis_block_init(&(sd->vd), &(sd->vb));
 
 	ogg_stream_init(&(sd->os), rand());
 
@@ -432,13 +448,13 @@ static int initEncoder(ShoutData * sd) {
 	return 0;
 }
 
-static int myShout_openShoutConn(AudioOutput * audioOutput) {
-	ShoutData * sd = (ShoutData *)audioOutput->data;
+static int myShout_openShoutConn(AudioOutput * audioOutput)
+{
+	ShoutData *sd = (ShoutData *) audioOutput->data;
 	time_t t = time(NULL);
 
-	if(sd->connAttempts!= 0 && 
-			(t - sd->lastAttempt) < CONN_ATTEMPT_INTERVAL) 
-	{
+	if (sd->connAttempts != 0 &&
+	    (t - sd->lastAttempt) < CONN_ATTEMPT_INTERVAL) {
 		return -1;
 	}
 
@@ -446,17 +462,16 @@ static int myShout_openShoutConn(AudioOutput * audioOutput) {
 
 	sd->lastAttempt = t;
 
-	if(shout_open(sd->shoutConn) != SHOUTERR_SUCCESS) {
+	if (shout_open(sd->shoutConn) != SHOUTERR_SUCCESS) {
 		ERROR("problem opening connection to shout server %s:%i "
-				"(attempt %i): %s\n",
-				shout_get_host(sd->shoutConn),
-				shout_get_port(sd->shoutConn),
-				sd->connAttempts,
-				shout_get_error(sd->shoutConn));
+		      "(attempt %i): %s\n",
+		      shout_get_host(sd->shoutConn),
+		      shout_get_port(sd->shoutConn),
+		      sd->connAttempts, shout_get_error(sd->shoutConn));
 		return -1;
 	}
 
-	if(initEncoder(sd) < 0) {
+	if (initEncoder(sd) < 0) {
 		shout_close(sd->shoutConn);
 		return -1;
 	}
@@ -466,7 +481,8 @@ static int myShout_openShoutConn(AudioOutput * audioOutput) {
 	copyTagToVorbisComment(sd);
 
 	vorbis_analysis_headerout(&(sd->vd), &(sd->vc), &(sd->header_main),
-			&(sd->header_comments), &(sd->header_codebooks));
+				  &(sd->header_comments),
+				  &(sd->header_codebooks));
 
 	ogg_stream_packetin(&(sd->os), &(sd->header_main));
 	ogg_stream_packetin(&(sd->os), &(sd->header_comments));
@@ -475,9 +491,8 @@ static int myShout_openShoutConn(AudioOutput * audioOutput) {
 	sd->opened = 1;
 	sd->tagToSend = 0;
 
-	while(ogg_stream_flush(&(sd->os), &(sd->og)))
-	{
-		if(write_page(sd) < 0) {
+	while (ogg_stream_flush(&(sd->os), &(sd->og))) {
+		if (write_page(sd) < 0) {
 			myShout_closeShoutConn(sd);
 			return -1;
 		}
@@ -488,14 +503,16 @@ static int myShout_openShoutConn(AudioOutput * audioOutput) {
 	return 0;
 }
 
-static int myShout_openDevice(AudioOutput * audioOutput) {
-	ShoutData * sd = (ShoutData *)audioOutput->data;
+static int myShout_openDevice(AudioOutput * audioOutput)
+{
+	ShoutData *sd = (ShoutData *) audioOutput->data;
 
 	audioOutput->open = 1;
 
-	if(sd->opened) return 0;
+	if (sd->opened)
+		return 0;
 
-	if(myShout_openShoutConn(audioOutput) < 0) {
+	if (myShout_openShoutConn(audioOutput) < 0) {
 		audioOutput->open = 0;
 		return -1;
 	}
@@ -503,76 +520,80 @@ static int myShout_openDevice(AudioOutput * audioOutput) {
 	return 0;
 }
 
-static void myShout_sendMetadata(ShoutData * sd) {
-	if(!sd->opened || !sd->tag) return;
+static void myShout_sendMetadata(ShoutData * sd)
+{
+	if (!sd->opened || !sd->tag)
+		return;
 
 	clearEncoder(sd);
-	if(initEncoder(sd) < 0) return;
+	if (initEncoder(sd) < 0)
+		return;
 
 	copyTagToVorbisComment(sd);
 
 	vorbis_analysis_headerout(&(sd->vd), &(sd->vc), &(sd->header_main),
-			&(sd->header_comments), &(sd->header_codebooks));
+				  &(sd->header_comments),
+				  &(sd->header_codebooks));
 
 	ogg_stream_packetin(&(sd->os), &(sd->header_main));
 	ogg_stream_packetin(&(sd->os), &(sd->header_comments));
 	ogg_stream_packetin(&(sd->os), &(sd->header_codebooks));
 
-	while(ogg_stream_flush(&(sd->os), &(sd->og)))
-	{
-		if(write_page(sd) < 0) {
+	while (ogg_stream_flush(&(sd->os), &(sd->og))) {
+		if (write_page(sd) < 0) {
 			myShout_closeShoutConn(sd);
 			return;
 		}
 	}
 
 	/*if(sd->tag) freeMpdTag(sd->tag);
-	sd->tag = NULL;*/
+	   sd->tag = NULL; */
 	sd->tagToSend = 0;
 }
 
-static int myShout_play(AudioOutput * audioOutput, char * playChunk, int size) {
-	int i,j;
-	ShoutData * sd = (ShoutData *)audioOutput->data;
-	float ** vorbbuf;
+static int myShout_play(AudioOutput * audioOutput, char *playChunk, int size)
+{
+	int i, j;
+	ShoutData *sd = (ShoutData *) audioOutput->data;
+	float **vorbbuf;
 	int samples;
-	int bytes = sd->audioFormat->bits/8;
+	int bytes = sd->audioFormat->bits / 8;
 
-	if(sd->opened && sd->tagToSend) myShout_sendMetadata(sd);
+	if (sd->opened && sd->tagToSend)
+		myShout_sendMetadata(sd);
 
-	if(!sd->opened) {
-		if(myShout_openShoutConn(audioOutput) < 0) {
+	if (!sd->opened) {
+		if (myShout_openShoutConn(audioOutput) < 0) {
 			return -1;
 		}
 	}
 
-	samples = size/(bytes*sd->audioFormat->channels);
+	samples = size / (bytes * sd->audioFormat->channels);
 
 	/* this is for only 16-bit audio */
 
 	vorbbuf = vorbis_analysis_buffer(&(sd->vd), samples);
 
-	for(i=0; i<samples; i++) {
-		for(j=0; j<sd->audioFormat->channels; j++) {
-			vorbbuf[j][i] = (*((mpd_sint16 *)playChunk)) / 32768.0;
+	for (i = 0; i < samples; i++) {
+		for (j = 0; j < sd->audioFormat->channels; j++) {
+			vorbbuf[j][i] = (*((mpd_sint16 *) playChunk)) / 32768.0;
 			playChunk += bytes;
 		}
 	}
 
 	vorbis_analysis_wrote(&(sd->vd), samples);
 
-	while(1 == vorbis_analysis_blockout(&(sd->vd), &(sd->vb))) {
+	while (1 == vorbis_analysis_blockout(&(sd->vd), &(sd->vb))) {
 		vorbis_analysis(&(sd->vb), NULL);
 		vorbis_bitrate_addblock(&(sd->vb));
 
-		while(vorbis_bitrate_flushpacket(&(sd->vd), &(sd->op))) {
+		while (vorbis_bitrate_flushpacket(&(sd->vd), &(sd->op))) {
 			ogg_stream_packetin(&(sd->os), &(sd->op));
 		}
 	}
 
-
-	while(ogg_stream_pageout(&(sd->os), &(sd->og)) != 0) {
-		if(write_page(sd) < 0) {
+	while (ogg_stream_pageout(&(sd->os), &(sd->og)) != 0) {
+		if (write_page(sd) < 0) {
 			myShout_closeShoutConn(sd);
 			return -1;
 		}
@@ -581,21 +602,23 @@ static int myShout_play(AudioOutput * audioOutput, char * playChunk, int size) {
 	return 0;
 }
 
-static void myShout_setTag(AudioOutput * audioOutput, MpdTag * tag) {
-	ShoutData * sd = (ShoutData *)audioOutput->data;
+static void myShout_setTag(AudioOutput * audioOutput, MpdTag * tag)
+{
+	ShoutData *sd = (ShoutData *) audioOutput->data;
 
-	if(sd->tag) freeMpdTag(sd->tag);
+	if (sd->tag)
+		freeMpdTag(sd->tag);
 	sd->tag = NULL;
 	sd->tagToSend = 0;
 
-	if(!tag) return;
+	if (!tag)
+		return;
 
 	sd->tag = mpdTagDup(tag);
 	sd->tagToSend = 1;
 }
 
-AudioOutputPlugin shoutPlugin = 
-{
+AudioOutputPlugin shoutPlugin = {
 	"shout",
 	NULL,
 	myShout_initDriver,
@@ -610,5 +633,4 @@ AudioOutputPlugin shoutPlugin =
 #else
 
 DISABLED_AUDIO_OUTPUT_PLUGIN(shoutPlugin)
-
 #endif