Changeset 4195 in orxonox.OLD

Timestamp:

May 16, 2005, 1:39:12 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/openAL: added the SingletonClass for the SoundEngine

Location:

orxonox/branches/openAL/src

Files:

• Makefile.am (modified) (3 diffs)
• Makefile.in (modified) (8 diffs)
• lib/sound (added)
• lib/sound/sound_engine.cc (copied) (copied from orxonox/branches/openAL/src/proto/proto_singleton.cc) (5 diffs)
• lib/sound/sound_engine.h (copied) (copied from orxonox/branches/openAL/src/proto/proto_singleton.h) (2 diffs)

orxonox/branches/openAL/src/Makefile.am

@@ -9 +9 @@
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/particles
+AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/sound
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui
 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gui
@@ -78 +79 @@
                  lib/graphics/particles/particle_system.cc \
                  lib/graphics/particles/particle_emitter.cc \
+                 lib/sound/sound_engine.cc \
                  lib/lang/base_entity.cc \
                  lib/lang/base_object.cc \
@@ -143 +145 @@
                  lib/graphics/particles/particle_system.h \
                  lib/graphics/particles/particle_emitter.h \
+                 lib/sound/sound_engine.h \
                  lib/data/data_tank.h \
                  lib/lang/base_entity.h \

orxonox/branches/openAL/src/Makefile.in

@@ -86 +86 @@
         texture.$(OBJEXT) particle_engine.$(OBJEXT) \
         particle_system.$(OBJEXT) particle_emitter.$(OBJEXT) \
-        base_entity.$(OBJEXT) base_object.$(OBJEXT) \
-        ini_parser.$(OBJEXT) list.$(OBJEXT) resource_manager.$(OBJEXT) \
-        vector.$(OBJEXT) curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT) \
-        tinyxml.$(OBJEXT) tinystr.$(OBJEXT) tinyxmlerror.$(OBJEXT) \
+        sound_engine.$(OBJEXT) base_entity.$(OBJEXT) \
+        base_object.$(OBJEXT) ini_parser.$(OBJEXT) list.$(OBJEXT) \
+        resource_manager.$(OBJEXT) vector.$(OBJEXT) curve.$(OBJEXT) \
+        glmenu_imagescreen.$(OBJEXT) tinyxml.$(OBJEXT) \
+        tinystr.$(OBJEXT) tinyxmlerror.$(OBJEXT) \
         tinyxmlparser.$(OBJEXT) benchmark.$(OBJEXT)
 orxonox_OBJECTS = $(am_orxonox_OBJECTS)
@@ -136 +137 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/satellite.Po ./$(DEPDIR)/skybox.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/skysphere.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/sound_engine.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/story_entity.Po ./$(DEPDIR)/terrain.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/test_bullet.Po ./$(DEPDIR)/test_gun.Po \
@@ -273 +275 @@
 target_vendor = @target_vendor@
 MAINSRCDIR = .
-AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/graphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/graphics/particles -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/gui/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai -I$(MAINSRCDIR)/util -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common -I$(MAINSRCDIR)/subprojects
+AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/graphics -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/graphics/particles -I$(MAINSRCDIR)/lib/sound -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/gui/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai -I$(MAINSRCDIR)/util -I$(MAINSRCDIR)/util/animation -I$(MAINSRCDIR)/util/common -I$(MAINSRCDIR)/subprojects
 noinst_LIBRARIES = libORXgui.a
 orxonox_DEPENDENCIES = libORXgui.a
@@ -321 +323 @@
                  lib/graphics/particles/particle_system.cc \
                  lib/graphics/particles/particle_emitter.cc \
+                 lib/sound/sound_engine.cc \
                  lib/lang/base_entity.cc \
                  lib/lang/base_object.cc \
@@ -386 +389 @@
                  lib/graphics/particles/particle_system.h \
                  lib/graphics/particles/particle_emitter.h \
+                 lib/sound/sound_engine.h \
                  lib/data/data_tank.h \
                  lib/lang/base_entity.h \
@@ -557 +561 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/skybox.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/skysphere.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sound_engine.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/story_entity.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/terrain.Po@am__quote@
@@ -1325 +1330 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particle_emitter.obj `if test -f 'lib/graphics/particles/particle_emitter.cc'; then $(CYGPATH_W) 'lib/graphics/particles/particle_emitter.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/particles/particle_emitter.cc'; fi`
+
+sound_engine.o: lib/sound/sound_engine.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sound_engine.o -MD -MP -MF "$(DEPDIR)/sound_engine.Tpo" -c -o sound_engine.o `test -f 'lib/sound/sound_engine.cc' || echo '$(srcdir)/'`lib/sound/sound_engine.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/sound_engine.Tpo" "$(DEPDIR)/sound_engine.Po"; else rm -f "$(DEPDIR)/sound_engine.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/sound/sound_engine.cc' object='sound_engine.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/sound_engine.Po' tmpdepfile='$(DEPDIR)/sound_engine.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sound_engine.o `test -f 'lib/sound/sound_engine.cc' || echo '$(srcdir)/'`lib/sound/sound_engine.cc
+
+sound_engine.obj: lib/sound/sound_engine.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sound_engine.obj -MD -MP -MF "$(DEPDIR)/sound_engine.Tpo" -c -o sound_engine.obj `if test -f 'lib/sound/sound_engine.cc'; then $(CYGPATH_W) 'lib/sound/sound_engine.cc'; else $(CYGPATH_W) '$(srcdir)/lib/sound/sound_engine.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/sound_engine.Tpo" "$(DEPDIR)/sound_engine.Po"; else rm -f "$(DEPDIR)/sound_engine.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/sound/sound_engine.cc' object='sound_engine.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/sound_engine.Po' tmpdepfile='$(DEPDIR)/sound_engine.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o sound_engine.obj `if test -f 'lib/sound/sound_engine.cc'; then $(CYGPATH_W) 'lib/sound/sound_engine.cc'; else $(CYGPATH_W) '$(srcdir)/lib/sound/sound_engine.cc'; fi`
 
 base_entity.o: lib/lang/base_entity.cc
@@ -1656 +1677 @@
 
 distdir: $(DISTFILES)
-        $(mkdir_p) $(distdir)/ai $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/data $(distdir)/lib/graphics $(distdir)/lib/graphics/particles $(distdir)/lib/gui/gui $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/network $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/util $(distdir)/util/animation $(distdir)/util/common $(distdir)/world_entities
+        $(mkdir_p) $(distdir)/ai $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/data $(distdir)/lib/graphics $(distdir)/lib/graphics/particles $(distdir)/lib/gui/gui $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/sound $(distdir)/lib/util $(distdir)/network $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/util $(distdir)/util/animation $(distdir)/util/common $(distdir)/world_entities
         @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \

orxonox/branches/openAL/src/lib/sound/sound_engine.cc

@@ -10 +10 @@
 
    ### File Specific:
-   main-programmer: ...
+   main-programmer: Benjamin Grauer
    co-programmer: ...
 */
@@ -16 +16 @@
 //#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
 
-#include "proto_singleton.h"
+#include "sound_engine.h"
 
 using namespace std;
@@ -24 +24 @@
    \brief standard constructor
 */
-ProtoSingleton::ProtoSingleton () 
+SoundEngine::SoundEngine () 
 {
-   this->setClassName ("ProtoSingleton");
+   this->setClassName ("SoundEngine");
 
 }
@@ -33 +33 @@
    \brief the singleton reference to this class
 */
-ProtoSingleton* ProtoSingleton::singletonRef = NULL;
+SoundEngine* SoundEngine::singletonRef = NULL;
 
 /**
    \returns a Pointer to this Class
 */
-ProtoSingleton* ProtoSingleton::getInstance(void)
+SoundEngine* SoundEngine::getInstance(void)
 {
-  if (!ProtoSingleton::singletonRef)
-    ProtoSingleton::singletonRef = new ProtoSingleton();
-  return ProtoSingleton::singletonRef;
+  if (!SoundEngine::singletonRef)
+    SoundEngine::singletonRef = new SoundEngine();
+  return SoundEngine::singletonRef;
 }
 
@@ -49 +49 @@
 
 */
-ProtoSingleton::~ProtoSingleton () 
+SoundEngine::~SoundEngine () 
 {
-  ProtoSingleton::singletonRef = NULL;
+  SoundEngine::singletonRef = NULL;
 
 }

orxonox/branches/openAL/src/lib/sound/sound_engine.h

@@ -1 +1 @@
 /*! 
-    \file proto_singleton.h
-    \brief Definition of the ... singleton Class
+    \file sound_engine.h
+    \brief Definition of the SoundEngine singleton Class
     
 */
 
-#ifndef _PROTO_SINGLETON_H
-#define _PROTO_SINGLETON_H
+#ifndef _SOUND_ENGINE_H
+#define _SOUND_ENGINE_H
 
 #include "base_object.h"
@@ -12 +12 @@
 // FORWARD DEFINITION
 
-//! A default singleton class.
-class ProtoSingleton : public BaseObject {
+//! A Class that handles audio via the openAudioLibrary
+class SoundEngine : public BaseObject {
 
  public:
-  static ProtoSingleton* getInstance(void);
-  virtual ~ProtoSingleton(void);
+  static SoundEngine* getInstance(void);
+  virtual ~SoundEngine(void);
 
  private:
-  ProtoSingleton(void);
-  static ProtoSingleton* singletonRef;
+  SoundEngine(void);
+  static SoundEngine* singletonRef;
 };
 
-#endif /* _PROTO_SINGLETON_H */
+#endif /* _SOUND_ENGINE_H */