Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


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

better incls

Location:
branches/cleanup/src/lib
Files:
6 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;

  • branches/cleanup/src/lib/util/debug_buffer.cc

    r10575 r10577  
    2020#include "debug.h"
    2121#include "compiler.h"
    22 #include "threads/threading.h"
     22#include "threads/mutex_locker.h"
    2323
    2424/**
    … …  
    6464  static OrxThread::Mutex DebugBuffer__bufferMutex;
    6565
    66   OrxThread::MutexLock bufferLock(&DebugBuffer__bufferMutex);
     66  OrxThread::MutexLocker bufferLock(&DebugBuffer__bufferMutex);
    6767
    6868  va_list arguments;

  • branches/cleanup/src/lib/util/filesys/net_link.cc

    r9406 r10577  
    1717#include "debug.h"
    1818
     19#include "threads/mutex_locker.h"
    1920
    2021#ifdef __OSX__
    … …  
    4546int NetLink::openupInBrowser(void* url)
    4647{
    47   OrxThread::MutexLock lock(&NetLink::_mutex);
     48  OrxThread::MutexLocker lock(&NetLink::_mutex);
    4849
    4950  std::string URL = *(std::string*)url;
    … …  
    6970void NetLink::setDefaultBrowser(const std::string& browserName)
    7071{
    71   OrxThread::MutexLock lock(&NetLink::_mutex);
     72  OrxThread::MutexLocker lock(&NetLink::_mutex);
    7273  NetLink::_defaultBrowser = browserName;
    7374}

  • branches/cleanup/src/lib/util/filesys/net_link.h

    r10575 r10577  
    1919#include <list>
    2020
    21 #include "threads/threading.h"
     21#include "threads/mutex.h"
    2222
    2323//! NetLink is a File and Link executer for Internet Links

  • branches/cleanup/src/lib/util/threads/mutex_locker.h

    r10576 r10577  
    88
    99  //! A Class that locks a Mutex within its scope
    10   class MutexLock
     10  class MutexLocker
    1111  {
    1212  public:
    1313    //! Locks the Mutex mutex in this Scope.
    14     MutexLock(Mutex* mutex) { SDL_mutexP(mutex->getMutex()); this->mutex = mutex; };
    15     ~MutexLock() { SDL_mutexV(mutex->getMutex()); };
     14    MutexLocker(Mutex* mutex) { SDL_mutexP(mutex->getMutex()); this->mutex = mutex; };
     15    ~MutexLocker() { SDL_mutexV(mutex->getMutex()); };
    1616  private:
    1717    Mutex* mutex;         //!< The Mutex to lock.
Note: See TracChangeset for help on using the changeset viewer.