aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw27@cam.ac.uk>2008-11-24 00:58:50 +0000
committerThomas White <taw27@cam.ac.uk>2008-11-24 00:58:50 +0000
commitf058b688c203cfa0cc595ee9d76b400b5ad21eca (patch)
treefc352e00cb78e947dae668d66e386a1457117af8
parenta2090150615b96e040324d471c6fd0bd53360eb8 (diff)
Small audio fixes
-rw-r--r--src/audio.h2
-rw-r--r--src/main.c7
2 files changed, 8 insertions, 1 deletions
diff --git a/src/audio.h b/src/audio.h
index a8f0032..91781bf 100644
--- a/src/audio.h
+++ b/src/audio.h
@@ -31,7 +31,7 @@
#include "types.h"
-extern AudioContext *audio_setup(void);
+extern void audio_setup(void);
extern void audio_trigger_moo(void);
extern void audio_shutdown(void);
diff --git a/src/main.c b/src/main.c
index f07e829..9426896 100644
--- a/src/main.c
+++ b/src/main.c
@@ -31,6 +31,7 @@
#include <stdarg.h>
#include <stdio.h>
#include <glib.h>
+#include <SDL.h>
#include "types.h"
#include "mainwindow.h"
@@ -43,6 +44,12 @@ int main(int argc, char *argv[]) {
gtk_init(&argc, &argv);
g_thread_init(NULL);
+ if ( SDL_Init(SDL_INIT_VIDEO) < 0 ) {
+ fprintf(stderr, "Couldn't initialise SDL: %s\n", SDL_GetError());
+ return 1;
+ }
+ atexit(SDL_Quit);
+
/* Start the accelerometer thread */
accelerometer_start();