Changeset 4746 in orxonox.OLD for orxonox/trunk/src/lib/sound
- Timestamp:
- Jul 1, 2005, 12:48:48 PM (19 years ago)
- Location:
- orxonox/trunk/src/lib/sound
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/trunk/src/lib/sound/sound_engine.cc
r4605 r4746 79 79 } 80 80 81 SoundBuffer::~SoundBuffer( void)81 SoundBuffer::~SoundBuffer() 82 82 { 83 83 SoundEngine::getInstance()->removeBuffer(this); … … 115 115 \brief deletes a SoundSource 116 116 */ 117 SoundSource::~SoundSource( void)117 SoundSource::~SoundSource() 118 118 { 119 119 SoundEngine::getInstance()->removeSource(this); … … 306 306 \brief updates all The positions, Directions and Velocities of all Sounds 307 307 */ 308 void SoundEngine::update( void)308 void SoundEngine::update() 309 309 { 310 310 … … 351 351 \brief Removes all the Buffers that are not anymore needed by any Sources 352 352 */ 353 void SoundEngine::flushUnusedBuffers( void)353 void SoundEngine::flushUnusedBuffers() 354 354 { 355 355 tIterator<SoundBuffer>* bufferIterator = this->bufferList->getIterator(); … … 376 376 \brief SourceEngine::flushAllBuffers 377 377 */ 378 void SoundEngine::flushAllBuffers( void)378 void SoundEngine::flushAllBuffers() 379 379 { 380 380 tIterator<SoundBuffer>* bufferIterator = this->bufferList->getIterator(); … … 391 391 \brief initializes Audio in general 392 392 */ 393 bool SoundEngine::initAudio( void)393 bool SoundEngine::initAudio() 394 394 { 395 395 ALenum result; -
orxonox/trunk/src/lib/sound/sound_engine.h
r4597 r4746 24 24 public: 25 25 SoundBuffer(const char* fileName); 26 ~SoundBuffer( void);26 ~SoundBuffer(); 27 27 28 28 /** \returns the ID of the buffer used in this SoundBuffer */ 29 inline ALuint getID( void) { return this->bufferID; }29 inline ALuint getID() { return this->bufferID; } 30 30 31 31 private: … … 41 41 public: 42 42 SoundSource(SoundBuffer* buffer, PNode* sourceNode = NULL); 43 ~SoundSource( void);43 ~SoundSource(); 44 44 45 45 // user interaction … … 51 51 // development functions 52 52 /** \returns The ID of this Source */ 53 inline ALuint getID( void) const { return this->sourceID; }53 inline ALuint getID() const { return this->sourceID; } 54 54 /** \returns the SoundBuffer of this Source */ 55 inline SoundBuffer* getBuffer( void) const { return this->buffer; }55 inline SoundBuffer* getBuffer() const { return this->buffer; } 56 56 /** \returns the SourceNode of this Source */ 57 inline PNode* getNode( void) const { return this->sourceNode;}57 inline PNode* getNode() const { return this->sourceNode;} 58 58 59 59 void setRolloffFactor(ALfloat rolloffFactor); … … 71 71 72 72 public: 73 virtual ~SoundEngine( void);73 virtual ~SoundEngine(); 74 74 /** \returns a Pointer to the only object of this Class */ 75 inline static SoundEngine* getInstance( void) { if (!singletonRef) singletonRef = new SoundEngine(); return singletonRef; };75 inline static SoundEngine* getInstance() { if (!singletonRef) singletonRef = new SoundEngine(); return singletonRef; }; 76 76 77 77 SoundSource* createSource(const char* fileName, PNode* sourceNode = NULL); … … 86 86 void removeSource(SoundSource* source); 87 87 88 void update( void);88 void update(); 89 89 90 90 // administrative 91 void flushUnusedBuffers( void);92 void flushAllBuffers( void);93 bool initAudio( void);91 void flushUnusedBuffers(); 92 void flushAllBuffers(); 93 bool initAudio(); 94 94 95 95 // error handling: … … 99 99 100 100 private: 101 SoundEngine( void);101 SoundEngine(); 102 102 static SoundEngine* singletonRef; //!< Reference to this class 103 103
Note: See TracChangeset
for help on using the changeset viewer.