From eac1474a8031ec367a9f21c367e65df9fe8b99fc Mon Sep 17 00:00:00 2001
From: Thomas White <taw27@cam.ac.uk>
Date: Mon, 16 Mar 2009 16:09:21 +0000
Subject: Linewrap, brackets etc

---
 src/accelerometers.c |  9 ++++++---
 src/audio.c          | 29 ++++++++++++++---------------
 src/main.c           |  8 ++++----
 src/mainwindow.c     | 18 +++++++++++-------
 4 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/src/accelerometers.c b/src/accelerometers.c
index 582e664..2a657a3 100644
--- a/src/accelerometers.c
+++ b/src/accelerometers.c
@@ -39,7 +39,8 @@
 #include "types.h"
 #include "audio.h"
 
-struct input_event {
+struct input_event
+{
 	struct timeval time;
 	uint16_t type;
 	uint16_t code;
@@ -66,7 +67,8 @@ static FILE *accelerometer_freerunner_open_threshold(const char *mode)
 	}
 
 	/* Try 2.6.28+ method */
-	fh = fopen("/sys/class/i2c-adapter/i2c-0/0-0073/lis302dl.2/threshold", mode);
+	fh = fopen("/sys/class/i2c-adapter/i2c-0/0-0073/lis302dl.2/threshold",
+									mode);
 	if ( fh != NULL ) {
 		return fh;
 	}
@@ -156,7 +158,8 @@ AccelHandle *accelerometer_open()
 	accel->type = ACCEL_UNKNOWN;
 
 	/* Determine accelerometer type */
-	accel->fd = open("/dev/input/by-path/platform-hdaps-event-joystick", O_RDONLY, O_NONBLOCK);
+	accel->fd = open("/dev/input/by-path/platform-hdaps-event-joystick",
+							O_RDONLY, O_NONBLOCK);
 	if ( accel->fd != -1 ) {
 		accel->type = ACCEL_HDAPS;
 		printf("ThinkPad HDAPS detected\n");
diff --git a/src/audio.c b/src/audio.c
index fd54041..3cb498b 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -43,8 +43,8 @@
 
 static AudioContext *audio_context = NULL;
 
-static void audio_mix(void *data, Uint8 *stream8, int len) {
-
+static void audio_mix(void *data, Uint8 *stream8, int len)
+{
 	AudioContext *a = data;
 	int j;
 	Sint16 *stream = (Sint16 *)stream8;
@@ -64,11 +64,10 @@ static void audio_mix(void *data, Uint8 *stream8, int len) {
 		}
 
 	}
-
 }
 
-void audio_trigger_moo() {
-
+void audio_trigger_moo()
+{
 	AudioContext *a = audio_context;
 
 	if ( a == NULL ) {
@@ -89,12 +88,11 @@ void audio_trigger_moo() {
 	if ( a->moo_pos == a->moo_len ) {
 		a->moo_pos = 0;
 	}
-
 }
 
 /* SDL audio initial setup */
-void audio_setup() {
-
+void audio_setup()
+{
 	AudioContext *a;
 	SDL_AudioSpec fmt;
 	SDL_AudioSpec wave;
@@ -122,12 +120,15 @@ void audio_setup() {
 		return;
 	}
 
-	if ( SDL_LoadWAV(DATADIR"/openmoocow/moo.wav", &wave, &data, &dlen) == NULL ) {
-		fprintf(stderr, "Couldn't load moo sound: %s\n", SDL_GetError());
+	if ( SDL_LoadWAV(DATADIR"/openmoocow/moo.wav", &wave, &data, &dlen)
+								== NULL ) {
+		fprintf(stderr, "Couldn't load moo sound: %s\n",
+				SDL_GetError());
 		free(a);
 		return;
 	}
-	SDL_BuildAudioCVT(&cvt, wave.format, wave.channels, wave.freq, AUDIO_S16, 1, 44100);
+	SDL_BuildAudioCVT(&cvt, wave.format, wave.channels, wave.freq,
+				AUDIO_S16, 1, 44100);
 	cvt.buf = malloc(dlen*cvt.len_mult);
 	if ( cvt.buf == NULL ) {
 		fprintf(stderr, "Not enough memory to convert audio \n");
@@ -146,11 +147,10 @@ void audio_setup() {
 	audio_context = a;
 
 	SDL_PauseAudio(0);
-
 }
 
-void audio_shutdown() {
-
+void audio_shutdown()
+{
 	AudioContext *a = audio_context;
 
 	if ( a == NULL ) return;
@@ -159,5 +159,4 @@ void audio_shutdown() {
 
 	/* Now this can be freed */
 	free(a);
-
 }
diff --git a/src/main.c b/src/main.c
index 60ce863..dc13eaa 100644
--- a/src/main.c
+++ b/src/main.c
@@ -38,8 +38,8 @@
 #include "mainwindow.h"
 #include "accelerometers.h"
 
-int main(int argc, char *argv[]) {
-
+int main(int argc, char *argv[])
+{
 	MainWindow *mw;
 	int graphics = 0;
 	GThread *accel_thread;
@@ -52,7 +52,8 @@ int main(int argc, char *argv[]) {
 	}
 
 	if ( SDL_Init(SDL_INIT_AUDIO) < 0 ) {
-		fprintf(stderr, "Couldn't initialise SDL: %s\n", SDL_GetError());
+		fprintf(stderr, "Couldn't initialise SDL: %s\n",
+							SDL_GetError());
 		return 1;
 	}
 
@@ -74,5 +75,4 @@ int main(int argc, char *argv[]) {
 	SDL_Quit();
 
 	return 0;
-
 }
diff --git a/src/mainwindow.c b/src/mainwindow.c
index e718073..25b9a57 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -32,18 +32,21 @@
 #include "types.h"
 #include "audio.h"
 
-static gint mainwindow_closed(GtkWidget *widget, MainWindow *mw) {
+static gint mainwindow_closed(GtkWidget *widget, MainWindow *mw)
+{
 	gtk_main_quit();
 	return 0;
 }
 
-static gint mainwindow_clicked(GtkWidget *widget, GdkEventButton *event, gpointer data) {
+static gint mainwindow_clicked(GtkWidget *widget, GdkEventButton *event,
+				gpointer data)
+{
 	audio_trigger_moo();
 	return 0;
 }
 
-MainWindow *mainwindow_open(void) {
-
+MainWindow *mainwindow_open()
+{
 	MainWindow *mw;
 	GtkWidget *eb;
 
@@ -61,10 +64,11 @@ MainWindow *mainwindow_open(void) {
 	gtk_widget_add_events(GTK_WIDGET(eb), GDK_BUTTON_PRESS_MASK);
 	gtk_misc_set_alignment(GTK_MISC(mw->cow), 0.5, 1.0);
 
-	g_signal_connect(G_OBJECT(eb), "button_press_event", G_CALLBACK(mainwindow_clicked), mw);
-	g_signal_connect(G_OBJECT(mw->window), "destroy", G_CALLBACK(mainwindow_closed), mw);
+	g_signal_connect(G_OBJECT(eb), "button_press_event",
+					G_CALLBACK(mainwindow_clicked), mw);
+	g_signal_connect(G_OBJECT(mw->window), "destroy",
+					G_CALLBACK(mainwindow_closed), mw);
 	gtk_widget_show_all(mw->window);
 
 	return mw;
-
 }
-- 
cgit v1.2.3