[Gemrb-commits] SF.net SVN: gemrb: [4741] gemrb/trunk/gemrb/plugins/ACMImporter

[<wjp...@us...>]

Revision: 4741
          http://gemrb.svn.sourceforge.net/gemrb/?rev=4741&view=rev
Author:   wjpalenstijn
Date:     2007-08-05 10:35:02 -0700 (Sun, 05 Aug 2007)

Log Message:
-----------
small header cleanup

Modified Paths:
--------------
    gemrb/trunk/gemrb/plugins/ACMImporter/ACMImp.cpp
    gemrb/trunk/gemrb/plugins/ACMImporter/ACMImp.h
    gemrb/trunk/gemrb/plugins/ACMImporter/AmbientMgrAL.cpp

Modified: gemrb/trunk/gemrb/plugins/ACMImporter/ACMImp.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/ACMImporter/ACMImp.cpp	2007-08-04 09:34:37 UTC (rev 4740)
+++ gemrb/trunk/gemrb/plugins/ACMImporter/ACMImp.cpp	2007-08-05 17:35:02 UTC (rev 4741)
@@ -26,6 +26,8 @@
 #include "../Core/Variables.h"
 #include "ACMImp.h"
 
+#include "SDL.h"
+
 #include <fcntl.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -41,6 +43,15 @@
 #define ACM_BUFFERSIZE 8192
 #define MUSICBUFFERS 10
 
+struct AudioStream {
+	ALuint Buffer;
+	ALuint Source;
+	int Duration;
+	bool free;
+	//bool playing;
+	//CSoundReader* reader;
+};
+
 static AudioStream streams[MAX_STREAMS], speech;
 static ALuint MusicSource, MusicBuffers[MUSICBUFFERS];
 static bool musicPlaying, stayAlive;

Modified: gemrb/trunk/gemrb/plugins/ACMImporter/ACMImp.h
===================================================================
--- gemrb/trunk/gemrb/plugins/ACMImporter/ACMImp.h	2007-08-04 09:34:37 UTC (rev 4740)
+++ gemrb/trunk/gemrb/plugins/ACMImporter/ACMImp.h	2007-08-05 17:35:02 UTC (rev 4741)
@@ -25,9 +25,6 @@
 #include "../Core/SoundMgr.h"
 #include "../Core/FileStream.h"
 
-#include <SDL.h>
-#include <SDL_thread.h>
-
 class AmbientMgrAL;
 
 #ifndef WIN32
@@ -45,15 +42,6 @@
 // the distance at which sound is played at full volume
 #define REFERENCE_DISTANCE 50
 
-typedef struct AudioStream {
-	ALuint Buffer;
-	ALuint Source;
-	int Duration;
-	bool free;
-	//bool playing;
-	//CSoundReader* reader;
-} AudioStream;
-
 class ACMImp : public SoundMgr {
 private:
 	void clearstreams();

Modified: gemrb/trunk/gemrb/plugins/ACMImporter/AmbientMgrAL.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/ACMImporter/AmbientMgrAL.cpp	2007-08-04 09:34:37 UTC (rev 4740)
+++ gemrb/trunk/gemrb/plugins/ACMImporter/AmbientMgrAL.cpp	2007-08-05 17:35:02 UTC (rev 4741)
@@ -28,6 +28,8 @@
 #include "ACMImp.h"
 #include "AmbientMgrAL.h"
 
+#include "SDL.h"
+
 // legal nop if already reset
 void AmbientMgrAL::reset()
 {


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