Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4195 in orxonox.OLD


Ignore:
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:
1 added
2 edited
2 copied

Legend:

Unmodified
Added
Removed
  • orxonox/branches/openAL/src/Makefile.am

    r4194 r4195  
    99AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer
    1010AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/particles
     11AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/sound
    1112AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui
    1213AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gui/gui
     
    7879                 lib/graphics/particles/particle_system.cc \
    7980                 lib/graphics/particles/particle_emitter.cc \
     81                 lib/sound/sound_engine.cc \
    8082                 lib/lang/base_entity.cc \
    8183                 lib/lang/base_object.cc \
     
    143145                 lib/graphics/particles/particle_system.h \
    144146                 lib/graphics/particles/particle_emitter.h \
     147                 lib/sound/sound_engine.h \
    145148                 lib/data/data_tank.h \
    146149                 lib/lang/base_entity.h \
  • orxonox/branches/openAL/src/Makefile.in

    r4194 r4195  
    8686        texture.$(OBJEXT) particle_engine.$(OBJEXT) \
    8787        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) \
    9293        tinyxmlparser.$(OBJEXT) benchmark.$(OBJEXT)
    9394orxonox_OBJECTS = $(am_orxonox_OBJECTS)
     
    136137@AMDEP_TRUE@    ./$(DEPDIR)/satellite.Po ./$(DEPDIR)/skybox.Po \
    137138@AMDEP_TRUE@    ./$(DEPDIR)/skysphere.Po \
     139@AMDEP_TRUE@    ./$(DEPDIR)/sound_engine.Po \
    138140@AMDEP_TRUE@    ./$(DEPDIR)/story_entity.Po ./$(DEPDIR)/terrain.Po \
    139141@AMDEP_TRUE@    ./$(DEPDIR)/test_bullet.Po ./$(DEPDIR)/test_gun.Po \
     
    273275target_vendor = @target_vendor@
    274276MAINSRCDIR = .
    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)/subprojects
     277AM_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
    276278noinst_LIBRARIES = libORXgui.a
    277279orxonox_DEPENDENCIES = libORXgui.a
     
    321323                 lib/graphics/particles/particle_system.cc \
    322324                 lib/graphics/particles/particle_emitter.cc \
     325                 lib/sound/sound_engine.cc \
    323326                 lib/lang/base_entity.cc \
    324327                 lib/lang/base_object.cc \
     
    386389                 lib/graphics/particles/particle_system.h \
    387390                 lib/graphics/particles/particle_emitter.h \
     391                 lib/sound/sound_engine.h \
    388392                 lib/data/data_tank.h \
    389393                 lib/lang/base_entity.h \
     
    557561@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/skybox.Po@am__quote@
    558562@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/skysphere.Po@am__quote@
     563@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sound_engine.Po@am__quote@
    559564@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/story_entity.Po@am__quote@
    560565@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/terrain.Po@am__quote@
     
    13251330@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    13261331@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
     1333sound_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
     1341sound_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`
    13271348
    13281349base_entity.o: lib/lang/base_entity.cc
     
    16561677
    16571678distdir: $(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_entities
     1679        $(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
    16591680        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    16601681        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
  • orxonox/branches/openAL/src/lib/sound/sound_engine.cc

    r4187 r4195  
    1010
    1111   ### File Specific:
    12    main-programmer: ...
     12   main-programmer: Benjamin Grauer
    1313   co-programmer: ...
    1414*/
     
    1616//#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
    1717
    18 #include "proto_singleton.h"
     18#include "sound_engine.h"
    1919
    2020using namespace std;
     
    2424   \brief standard constructor
    2525*/
    26 ProtoSingleton::ProtoSingleton ()
     26SoundEngine::SoundEngine ()
    2727{
    28    this->setClassName ("ProtoSingleton");
     28   this->setClassName ("SoundEngine");
    2929
    3030}
     
    3333   \brief the singleton reference to this class
    3434*/
    35 ProtoSingleton* ProtoSingleton::singletonRef = NULL;
     35SoundEngine* SoundEngine::singletonRef = NULL;
    3636
    3737/**
    3838   \returns a Pointer to this Class
    3939*/
    40 ProtoSingleton* ProtoSingleton::getInstance(void)
     40SoundEngine* SoundEngine::getInstance(void)
    4141{
    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;
    4545}
    4646
     
    4949
    5050*/
    51 ProtoSingleton::~ProtoSingleton ()
     51SoundEngine::~SoundEngine ()
    5252{
    53   ProtoSingleton::singletonRef = NULL;
     53  SoundEngine::singletonRef = NULL;
    5454
    5555}
  • orxonox/branches/openAL/src/lib/sound/sound_engine.h

    r4194 r4195  
    11/*!
    2     \file proto_singleton.h
    3     \brief Definition of the ... singleton Class
     2    \file sound_engine.h
     3    \brief Definition of the SoundEngine singleton Class
    44   
    55*/
    66
    7 #ifndef _PROTO_SINGLETON_H
    8 #define _PROTO_SINGLETON_H
     7#ifndef _SOUND_ENGINE_H
     8#define _SOUND_ENGINE_H
    99
    1010#include "base_object.h"
     
    1212// FORWARD DEFINITION
    1313
    14 //! A default singleton class.
    15 class ProtoSingleton : public BaseObject {
     14//! A Class that handles audio via the openAudioLibrary
     15class SoundEngine : public BaseObject {
    1616
    1717 public:
    18   static ProtoSingleton* getInstance(void);
    19   virtual ~ProtoSingleton(void);
     18  static SoundEngine* getInstance(void);
     19  virtual ~SoundEngine(void);
    2020
    2121 private:
    22   ProtoSingleton(void);
    23   static ProtoSingleton* singletonRef;
     22  SoundEngine(void);
     23  static SoundEngine* singletonRef;
    2424};
    2525
    26 #endif /* _PROTO_SINGLETON_H */
     26#endif /* _SOUND_ENGINE_H */
Note: See TracChangeset for help on using the changeset viewer.