Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Mar 14, 2011, 4:08:06 AM (14 years ago)
Author:
rgrieder
Message:

Merged mac_osx branch (after renaming it from ois_update) into kicklib branch.

Location:
code/branches/kicklib
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • code/branches/kicklib

  • code/branches/kicklib/src/orxonox/MoodManager.cc

    r8071 r8073  
    5050
    5151        // Checking for the existence of the folder for the default mood
    52         const std::string& patha = "ambient/" + MoodManager::defaultMood_ + "/.";
    53         if (!Resource::exists(patha))
     52        const std::string& path = "ambient/" + MoodManager::defaultMood_ + "/.";
     53        if (!Resource::exists(path))
    5454        {
    5555            // TODO: Non-fatal error handling (non-critical resource missing)

  • code/branches/kicklib/src/orxonox/sound/BaseSound.cc

    r8071 r8073  
    3131#include <cassert>
    3232#include <vector>
    33 
    34 #ifdef ORXONOX_PLATFORM_APPLE
    35 #include "openal/al.h"
    36 #else
    3733#include <al.h>
    38 #endif
    3934
    4035#include "util/Math.h"

  • code/branches/kicklib/src/orxonox/sound/SoundBuffer.cc

    r8071 r8073  
    3030#include "SoundBuffer.h"
    3131
    32 #if defined(ORXONOX_PLATFORM_APPLE)
    33 #include <ALUT/alut.h>
    34 #else
    35 #include <AL/alut.h>
    36 #endif
     32#include <alut.h>
    3733#include <vorbis/vorbisfile.h>
    3834

  • code/branches/kicklib/src/orxonox/sound/SoundManager.cc

    r8071 r8073  
    3131#include "SoundManager.h"
    3232
    33 #if defined(__APPLE__)
    34 #include <ALUT/alut.h>
    35 #else
    36 #include <AL/alut.h>
    37 #endif
    3833#include <utility>
     34#include <alut.h>
    3935#include <loki/ScopeGuard.h>
    4036
    … …  
    8581        SetConfigValue(bDisableSound_, false);
    8682        if (bDisableSound_)
    87             ThrowException(InitialisationAborted, "Sound: Not loading at all");       
     83            ThrowException(InitialisationAborted, "Sound: Not loading at all");
    8884        if (!alutInitWithoutContext(NULL, NULL))
    8985            ThrowException(InitialisationFailed, "Sound Error: ALUT initialisation failed: " << alutGetErrorString(alutGetError()));
    … …  
    133129        GameMode::setPlaysSound(true);
    134130        Loki::ScopeGuard resetPlaysSoundGuard = Loki::MakeGuard(&GameMode::setPlaysSound, false);
    135        
     131
    136132        // Get some information about the sound
    137133        if (const char* version = alGetString(AL_VERSION))
    138             COUT(4) << "Sound: --- OpenAL Version: " << version << std::endl;           
     134            COUT(4) << "Sound: --- OpenAL Version: " << version << std::endl;
    139135        if (const char* vendor = alGetString(AL_VENDOR))
    140136            COUT(4) << "Sound: --- OpenAL Vendor : " << vendor << std::endl;

  • code/branches/kicklib/src/orxonox/sound/SoundStreamer.cc

    r8071 r8073  
    2727#include "SoundStreamer.h"
    2828
    29 #ifdef ORXONOX_PLATFORM_APPLE
    30 #include "openal/al.h"
    31 #else
    3229#include <al.h>
    33 #endif
    34 
    3530#include <vorbis/vorbisfile.h>
    3631#include "SoundManager.h"

  • code/branches/kicklib/src/orxonox/sound/WorldSound.cc

    r8071 r8073  
    3030#include "WorldSound.h"
    3131
    32 #if defined(__APPLE__)
    33 #include <ALUT/alut.h>
    34 #else
    35 #include <AL/alut.h>
    36 #endif
     32#include <alut.h>
     33
    3734#include "util/Math.h"
    3835#include "core/CoreIncludes.h"
Note: See TracChangeset for help on using the changeset viewer.