Changeset 4195 in orxonox.OLD
- Timestamp:
- May 16, 2005, 1:39:12 PM (19 years ago)
- Location:
- orxonox/branches/openAL/src
- Files:
-
- 1 added
- 2 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
orxonox/branches/openAL/src/Makefile.am
r4194 r4195 9 9 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer 10 10 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/particles 11 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/sound 11 12 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui 12 13 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gui … … 78 79 lib/graphics/particles/particle_system.cc \ 79 80 lib/graphics/particles/particle_emitter.cc \ 81 lib/sound/sound_engine.cc \ 80 82 lib/lang/base_entity.cc \ 81 83 lib/lang/base_object.cc \ … … 143 145 lib/graphics/particles/particle_system.h \ 144 146 lib/graphics/particles/particle_emitter.h \ 147 lib/sound/sound_engine.h \ 145 148 lib/data/data_tank.h \ 146 149 lib/lang/base_entity.h \ -
orxonox/branches/openAL/src/Makefile.in
r4194 r4195 86 86 texture.$(OBJEXT) particle_engine.$(OBJEXT) \ 87 87 particle_system.$(OBJEXT) particle_emitter.$(OBJEXT) \ 88 base_entity.$(OBJEXT) base_object.$(OBJEXT) \ 89 ini_parser.$(OBJEXT) list.$(OBJEXT) resource_manager.$(OBJEXT) \ 90 vector.$(OBJEXT) curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT) \ 91 tinyxml.$(OBJEXT) tinystr.$(OBJEXT) tinyxmlerror.$(OBJEXT) \ 88 sound_engine.$(OBJEXT) base_entity.$(OBJEXT) \ 89 base_object.$(OBJEXT) ini_parser.$(OBJEXT) list.$(OBJEXT) \ 90 resource_manager.$(OBJEXT) vector.$(OBJEXT) curve.$(OBJEXT) \ 91 glmenu_imagescreen.$(OBJEXT) tinyxml.$(OBJEXT) \ 92 tinystr.$(OBJEXT) tinyxmlerror.$(OBJEXT) \ 92 93 tinyxmlparser.$(OBJEXT) benchmark.$(OBJEXT) 93 94 orxonox_OBJECTS = $(am_orxonox_OBJECTS) … … 136 137 @AMDEP_TRUE@ ./$(DEPDIR)/satellite.Po ./$(DEPDIR)/skybox.Po \ 137 138 @AMDEP_TRUE@ ./$(DEPDIR)/skysphere.Po \ 139 @AMDEP_TRUE@ ./$(DEPDIR)/sound_engine.Po \ 138 140 @AMDEP_TRUE@ ./$(DEPDIR)/story_entity.Po ./$(DEPDIR)/terrain.Po \ 139 141 @AMDEP_TRUE@ ./$(DEPDIR)/test_bullet.Po ./$(DEPDIR)/test_gun.Po \ … … 273 275 target_vendor = @target_vendor@ 274 276 MAINSRCDIR = . 275 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)/subprojects277 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 276 278 noinst_LIBRARIES = libORXgui.a 277 279 orxonox_DEPENDENCIES = libORXgui.a … … 321 323 lib/graphics/particles/particle_system.cc \ 322 324 lib/graphics/particles/particle_emitter.cc \ 325 lib/sound/sound_engine.cc \ 323 326 lib/lang/base_entity.cc \ 324 327 lib/lang/base_object.cc \ … … 386 389 lib/graphics/particles/particle_system.h \ 387 390 lib/graphics/particles/particle_emitter.h \ 391 lib/sound/sound_engine.h \ 388 392 lib/data/data_tank.h \ 389 393 lib/lang/base_entity.h \ … … 557 561 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/skybox.Po@am__quote@ 558 562 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/skysphere.Po@am__quote@ 563 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sound_engine.Po@am__quote@ 559 564 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/story_entity.Po@am__quote@ 560 565 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/terrain.Po@am__quote@ … … 1325 1330 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1326 1331 @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` 1332 1333 sound_engine.o: lib/sound/sound_engine.cc 1334 @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; \ 1335 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/sound_engine.Tpo" "$(DEPDIR)/sound_engine.Po"; else rm -f "$(DEPDIR)/sound_engine.Tpo"; exit 1; fi 1336 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/sound/sound_engine.cc' object='sound_engine.o' libtool=no @AMDEPBACKSLASH@ 1337 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/sound_engine.Po' tmpdepfile='$(DEPDIR)/sound_engine.TPo' @AMDEPBACKSLASH@ 1338 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1339 @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 1340 1341 sound_engine.obj: lib/sound/sound_engine.cc 1342 @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`; \ 1343 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/sound_engine.Tpo" "$(DEPDIR)/sound_engine.Po"; else rm -f "$(DEPDIR)/sound_engine.Tpo"; exit 1; fi 1344 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/sound/sound_engine.cc' object='sound_engine.obj' libtool=no @AMDEPBACKSLASH@ 1345 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/sound_engine.Po' tmpdepfile='$(DEPDIR)/sound_engine.TPo' @AMDEPBACKSLASH@ 1346 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1347 @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` 1327 1348 1328 1349 base_entity.o: lib/lang/base_entity.cc … … 1656 1677 1657 1678 distdir: $(DISTFILES) 1658 $(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_entities1679 $(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 1659 1680 @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ 1660 1681 topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ -
orxonox/branches/openAL/src/lib/sound/sound_engine.cc
r4187 r4195 10 10 11 11 ### File Specific: 12 main-programmer: ...12 main-programmer: Benjamin Grauer 13 13 co-programmer: ... 14 14 */ … … 16 16 //#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY 17 17 18 #include " proto_singleton.h"18 #include "sound_engine.h" 19 19 20 20 using namespace std; … … 24 24 \brief standard constructor 25 25 */ 26 ProtoSingleton::ProtoSingleton()26 SoundEngine::SoundEngine () 27 27 { 28 this->setClassName (" ProtoSingleton");28 this->setClassName ("SoundEngine"); 29 29 30 30 } … … 33 33 \brief the singleton reference to this class 34 34 */ 35 ProtoSingleton* ProtoSingleton::singletonRef = NULL;35 SoundEngine* SoundEngine::singletonRef = NULL; 36 36 37 37 /** 38 38 \returns a Pointer to this Class 39 39 */ 40 ProtoSingleton* ProtoSingleton::getInstance(void)40 SoundEngine* SoundEngine::getInstance(void) 41 41 { 42 if (! ProtoSingleton::singletonRef)43 ProtoSingleton::singletonRef = new ProtoSingleton();44 return ProtoSingleton::singletonRef;42 if (!SoundEngine::singletonRef) 43 SoundEngine::singletonRef = new SoundEngine(); 44 return SoundEngine::singletonRef; 45 45 } 46 46 … … 49 49 50 50 */ 51 ProtoSingleton::~ProtoSingleton()51 SoundEngine::~SoundEngine () 52 52 { 53 ProtoSingleton::singletonRef = NULL;53 SoundEngine::singletonRef = NULL; 54 54 55 55 } -
orxonox/branches/openAL/src/lib/sound/sound_engine.h
r4194 r4195 1 1 /*! 2 \file proto_singleton.h3 \brief Definition of the ...singleton Class2 \file sound_engine.h 3 \brief Definition of the SoundEngine singleton Class 4 4 5 5 */ 6 6 7 #ifndef _ PROTO_SINGLETON_H8 #define _ PROTO_SINGLETON_H7 #ifndef _SOUND_ENGINE_H 8 #define _SOUND_ENGINE_H 9 9 10 10 #include "base_object.h" … … 12 12 // FORWARD DEFINITION 13 13 14 //! A default singleton class.15 class ProtoSingleton: public BaseObject {14 //! A Class that handles audio via the openAudioLibrary 15 class SoundEngine : public BaseObject { 16 16 17 17 public: 18 static ProtoSingleton* getInstance(void);19 virtual ~ ProtoSingleton(void);18 static SoundEngine* getInstance(void); 19 virtual ~SoundEngine(void); 20 20 21 21 private: 22 ProtoSingleton(void);23 static ProtoSingleton* singletonRef;22 SoundEngine(void); 23 static SoundEngine* singletonRef; 24 24 }; 25 25 26 #endif /* _ PROTO_SINGLETON_H */26 #endif /* _SOUND_ENGINE_H */
Note: See TracChangeset
for help on using the changeset viewer.