From 4e0ee7abea422b844b11143c94cea88b309e0c68 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Sun, 1 Mar 2009 06:02:34 +0000
Subject: SCI: cleanup

svn-id: r39008
---
 engines/sci/sfx/mixer.cpp | 17 +++++++++++++++++
 engines/sci/sfx/mixer.h   | 15 ---------------
 2 files changed, 17 insertions(+), 15 deletions(-)

(limited to 'engines/sci')

diff --git a/engines/sci/sfx/mixer.cpp b/engines/sci/sfx/mixer.cpp
index e6785331ea..1abb7b6e1b 100644
--- a/engines/sci/sfx/mixer.cpp
+++ b/engines/sci/sfx/mixer.cpp
@@ -56,6 +56,23 @@ static int diagnosed_too_slow = 0;
 #define ACQUIRE_LOCK() P->_mixerLock.lock()
 #define RELEASE_LOCK() P->_mixerLock.unlock()
 
+#define SFX_PCM_FEED_MODE_ALIVE 0
+#define SFX_PCM_FEED_MODE_DEAD 1
+
+
+
+/** Finitary unsigned rational numbers */
+struct sfx_pcm_urat_t {
+	int nom, den;
+	int val;
+
+	/* Total value: val + nom/den, where (nom < den) guaranteed. */
+};
+
+struct twochannel_data {
+	int left, right;
+};
+
 struct sfx_pcm_feed_state_t {
 	sfx_pcm_feed_t *feed;
 
diff --git a/engines/sci/sfx/mixer.h b/engines/sci/sfx/mixer.h
index 740467968d..1f619245fe 100644
--- a/engines/sci/sfx/mixer.h
+++ b/engines/sci/sfx/mixer.h
@@ -30,21 +30,6 @@
 
 namespace Sci {
 
-#define SFX_PCM_FEED_MODE_ALIVE 0
-#define SFX_PCM_FEED_MODE_DEAD 1
-
-/** Finitary unsigned rational numbers */
-struct sfx_pcm_urat_t {
-	int nom, den;
-	int val;
-
-	/* Total value: val + nom/den, where (nom < den) guaranteed. */
-};
-
-struct twochannel_data {
-	int left, right;
-};
-
 struct sfx_pcm_mixer_t {
 	/* Mixers are the heart of all matters PCM. They take PCM data from subscribed feeds,
 	** mix it (hence the name) and ask the pcm device they are attached to to play the
-- 
cgit v1.2.3