Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10618 in orxonox.OLD for trunk/src/lib/sound


Ignore:
Timestamp:
Apr 4, 2007, 12:13:53 PM (18 years ago)
Author:
bknecht
Message:

merged cleanup into trunk (only improvements)

Location:
trunk
Files:
6 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1616OrxonoxPlayability.kdevses
        1717OrxonoxPlayability.kdevelop.pcs
         18orxonox.backtrace
         19orxonox.kdevses
         20orxonox.kdevelop.pcs

  • trunk/src/lib/sound/Makefile.am

    r9869 r10618  
    1111                        ogg_player.cc
    1212
    13 noinst_HEADERS = sound_engine.h \
    14                  sound_source.h \
    15                  sound_buffer.h \
    16                  sound_buffer_data.h \
    17                  resource_sound_buffer.h \
    18                  ogg_player.h
     13noinst_HEADERS = \
     14                alincl.h \
     15                sound_engine.h \
     16                sound_source.h \
     17                sound_buffer.h \
     18                sound_buffer_data.h \
     19                resource_sound_buffer.h \
     20                ogg_player.h

  • trunk/src/lib/sound/ogg_player.cc

    r9869 r10618  
    7979  bool OggPlayer::open(const std::string& fileName)
    8080  {
    81     OrxThread::MutexLock musicLock(&this->musicMutex);
     81    OrxThread::MutexLocker musicLock(&this->musicMutex);
    8282    // release old Ogg-File (if loaded)
    8383    if (this->state & OggPlayer::FileOpened)
    … …  
    212212    if (this->state & OggPlayer::FileOpened)
    213213    {
    214       OrxThread::MutexLock musicLock(&this->musicMutex);
     214      OrxThread::MutexLocker musicLock(&this->musicMutex);
    215215      ov_time_seek(&this->oggStream, timeCode);
    216216    }
    … …  
    263263    {
    264264      {
    265         OrxThread::MutexLock musicLock(&ogg->musicMutex);
     265        OrxThread::MutexLocker musicLock(&ogg->musicMutex);
    266266        ogg->update();
    267267      }
    … …  
    286286    this->state |= OggPlayer::Playing;
    287287
    288     OrxThread::MutexLock musicLock(&this->musicMutex);
     288    OrxThread::MutexLocker musicLock(&this->musicMutex);
    289289    if(!this->stream(this->buffers[0]) || !this->stream(this->buffers[1]))
    290290    {

  • trunk/src/lib/sound/ogg_player.h

    r9869 r10618  
    1313#include <ogg/ogg.h>
    1414#include <vorbis/vorbisfile.h>
    15 #include "util/threading.h"
     15#include "util/threads/mutex_locker.h"
    1616
    1717struct File;

  • trunk/src/lib/sound/sound_engine.cc

    r9869 r10618  
    2424#include "debug.h"
    2525#include "parser/preferences/preferences.h"
    26 #include "globals.h"
     26#include "orxonox_globals.h"
    2727#include "resource_sound_buffer.h"
    2828

  • trunk/src/lib/sound/sound_engine.h

    r9869 r10618  
    1515#include <list>
    1616#include <stack>
    17 #include "threading.h"
     17#include "threads/mutex.h"
    1818
    1919#define SOUND_DOPPLER_FACTOR       0.001          //!< A factor for the audible doppler effect
Note: See TracChangeset for help on using the changeset viewer.