[Scummvm-cvs-logs] SF.net SVN: scummvm:[39008] scummvm/trunk/engines/sci/sfx

[fingolfin at users.sourceforge.net]

Revision: 39008
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39008&view=rev
Author:   fingolfin
Date:     2009-03-01 06:02:34 +0000 (Sun, 01 Mar 2009)

Log Message:
-----------
SCI: cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sfx/mixer.cpp
    scummvm/trunk/engines/sci/sfx/mixer.h

Modified: scummvm/trunk/engines/sci/sfx/mixer.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/mixer.cpp	2009-03-01 06:02:26 UTC (rev 39007)
+++ scummvm/trunk/engines/sci/sfx/mixer.cpp	2009-03-01 06:02:34 UTC (rev 39008)
@@ -56,6 +56,23 @@
 #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;
 

Modified: scummvm/trunk/engines/sci/sfx/mixer.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/mixer.h	2009-03-01 06:02:26 UTC (rev 39007)
+++ scummvm/trunk/engines/sci/sfx/mixer.h	2009-03-01 06:02:34 UTC (rev 39008)
@@ -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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.