Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10577 in orxonox.OLD for branches/cleanup/src/lib/sound


Ignore:
Timestamp:
Feb 7, 2007, 9:31:36 PM (18 years ago)
Author:
bensch
Message:

better incls

Location:
branches/cleanup/src/lib/sound
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/cleanup/src/lib/sound/ogg_player.cc

    r9869 r10577  
    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    {

  • branches/cleanup/src/lib/sound/ogg_player.h

    r10575 r10577  
    1313#include <ogg/ogg.h>
    1414#include <vorbis/vorbisfile.h>
    15 #include "util/threads/threading.h"
     15#include "util/threads/mutex_locker.h"
    1616
    1717struct File;
Note: See TracChangeset for help on using the changeset viewer.