From ea5a1b849df6e5085a92957ad387f9e653674415 Mon Sep 17 00:00:00 2001
From: inmarket <andrewh@inmarket.com.au>
Date: Tue, 11 Mar 2014 17:13:31 +1000
Subject: Combine GAUDIN and GAUDOUT into a single GAUDIO module. Simplify
 GAUDIN (now GAUDIO RECORD) api. Update audio demo's to match. Port Win32
 driver to new audio api.

---
 src/gfx.c | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

(limited to 'src/gfx.c')

diff --git a/src/gfx.c b/src/gfx.c
index d01d3b1f..8e92fc29 100644
--- a/src/gfx.c
+++ b/src/gfx.c
@@ -44,13 +44,9 @@ extern void _gosDeinit(void);
 	extern void _gadcInit(void);
 	extern void _gadcDeinit(void);
 #endif
-#if GFX_USE_GAUDIN
-	extern void _gaudinInit(void);
-	extern void _gaudinDeinit(void);
-#endif
-#if GFX_USE_GAUDOUT
-	extern void _gaudoutInit(void);
-	extern void _gaudoutDeinit(void);
+#if GFX_USE_GAUDIO
+	extern void _gaudioInit(void);
+	extern void _gaudioDeinit(void);
 #endif
 #if GFX_USE_GMISC
 	extern void _gmiscInit(void);
@@ -88,11 +84,8 @@ void gfxInit(void)
 	#if GFX_USE_GADC
 		_gadcInit();
 	#endif
-	#if GFX_USE_GAUDIN
-		_gaudinInit();
-	#endif
-	#if GFX_USE_GAUDOUT
-		_gaudoutInit();
+	#if GFX_USE_GAUDIO
+		_gaudioInit();
 	#endif
 }
 
@@ -103,11 +96,8 @@ void gfxDeinit(void)
 	initDone = FALSE;
 
 	// We deinitialise the opposite way as we initialised
-	#if GFX_USE_GAUDOUT
-		_gaudoutDeinit();
-	#endif
 	#if GFX_USE_GAUDIN
-		_gaudinDeinit();
+		_gaudioDeinit();
 	#endif
 	#if GFX_USE_GADC
 		_gadcDeinit();
-- 
cgit v1.2.3