Changeset 3133 for code/branches

Timestamp:

Jun 9, 2009, 10:06:57 PM (15 years ago)

Author:

rgrieder

Message:

Reduced header file dependencies in the sound classes.

Location:

code/branches/pch/src/orxonox/sound

Files:

• SoundBase.cc (modified) (1 diff)
• SoundBase.h (modified) (3 diffs)
• SoundMainMenu.cc (modified) (1 diff)
• SoundMainMenu.h (modified) (2 diffs)
• SoundManager.cc (modified) (1 diff)
• SoundManager.h (modified) (3 diffs)

code/branches/pch/src/orxonox/sound/SoundBase.cc

@@ -26 +26 @@
  *
  */
+
+#include "SoundBase.h"
+
 #include <vector>
 #include <AL/alut.h>
 #include <vorbis/vorbisfile.h>
-
+#include <boost/static_assert.hpp>
+
+#include "util/Math.h"
+#include "core/Core.h"
 #include "orxonox/objects/worldentities/WorldEntity.h"
-#include "util/Math.h"
-#include "SoundBase.h"
 #include "SoundManager.h"
-#include "core/Core.h"
+
+// Make sure we correctly avoid including al.h in the header
+BOOST_STATIC_ASSERT(sizeof(uint32_t) == sizeof(ALuint));
+BOOST_STATIC_ASSERT(sizeof(int32_t)  == sizeof(ALint));
 
 namespace orxonox 

code/branches/pch/src/orxonox/sound/SoundBase.h

@@ -26 +26 @@
  *
  */
-#ifndef _SOUNDBASE_H__
-#define _SOUNDBASE_H__
-
-#include <AL/al.h>
-#include <string>
+#ifndef _SoundBase_H__
+#define _SoundBase_H__
 
 #include "OrxonoxPrereqs.h"
+#include <string>
 
 namespace orxonox
@@ -60 +58 @@
 
     private:
-        ALuint loadOggFile(std::string filename);
-        ALuint source_;
-        ALuint buffer_;
+        uint32_t loadOggFile(std::string filename);
+        uint32_t source_;
+        uint32_t buffer_;
         WorldEntity* entity_;
 
-        ALint getSourceState();
+        int32_t getSourceState();
 
         static SoundManager* soundmanager_s;
@@ -71 +69 @@
 } // namepsace orxonox
 
-#endif // _SOUNDBASE_H__
+#endif /* _SoundBase_H__ */

code/branches/pch/src/orxonox/sound/SoundMainMenu.cc

@@ -28 +28 @@
 
 #include "SoundMainMenu.h"
+
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"

code/branches/pch/src/orxonox/sound/SoundMainMenu.h

@@ -27 +27 @@
  */
 
-#ifndef _SOUNDMAINMENU_H__
-#define _SOUNDMAINMENU_H__
+#ifndef _SoundMainMenu_H__
+#define _SoundMainMenu_H__
+
+#include "OrxonoxPrereqs.h"
 
 #include <string>
-
 #include "core/OrxonoxClass.h"
-#include "OrxonoxPrereqs.h"
 #include "SoundBase.h"
 
@@ -48 +48 @@
     };
 }
-#endif
+
+#endif /* _SoundMainMenu_H__ */

code/branches/pch/src/orxonox/sound/SoundManager.cc

@@ -27 +27 @@
  */
 
+#include "SoundManager.h"
+
 #include <AL/alut.h>
 
+#include "util/Math.h"
 #include "orxonox/CameraManager.h"
 #include "orxonox/objects/worldentities/Camera.h"
-#include "util/Math.h"
 #include "SoundBase.h"
-#include "SoundManager.h"
 
 namespace orxonox

code/branches/pch/src/orxonox/sound/SoundManager.h

@@ -25 +25 @@
  *      ...
  */
-#ifndef _SOUNDMANGER_H__
-#define _SOUNDMANGER_H__
-
-#include <AL/al.h>
-#include <AL/alc.h>
+#ifndef _SoundManager_H__
+#define _SoundManager_H__
 
 #include "OrxonoxPrereqs.h"
+
+#include <list>
 #include "orxonox/objects/Tickable.h"
+
+// forward declarations
+typedef struct ALCcontext_struct ALCcontext;
+typedef struct ALCdevice_struct ALCdevice;
 
 namespace orxonox
@@ -49 +52 @@
         void addSound(SoundBase* sound);
         void removeSound(SoundBase* sound);
-        virtual void tick(float dt);
+        void tick(float dt);
         bool isSoundAvailable();
 
@@ -61 +64 @@
 } // namespace orxonox
 
-#endif // _SOUNDMANAGER_H__
+#endif /* _SoundManager_H__ */