Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3139 for code/branches


Ignore:
Timestamp:
Jun 10, 2009, 4:04:42 PM (15 years ago)
Author:
rgrieder
Message:

Typedef is probably better here than a static assert.

Location:
code/branches/pch/src/orxonox/sound
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/pch/src/orxonox/sound/SoundBase.cc

    r3133 r3139  
    3232#include <AL/alut.h>
    3333#include <vorbis/vorbisfile.h>
    34 #include <boost/static_assert.hpp>
    3534
    3635#include "util/Math.h"
     
    3837#include "orxonox/objects/worldentities/WorldEntity.h"
    3938#include "SoundManager.h"
    40 
    41 // Make sure we correctly avoid including al.h in the header
    42 BOOST_STATIC_ASSERT(sizeof(uint32_t) == sizeof(ALuint));
    43 BOOST_STATIC_ASSERT(sizeof(int32_t)  == sizeof(ALint));
    4439
    4540namespace orxonox
  • code/branches/pch/src/orxonox/sound/SoundBase.h

    r3133 r3139  
    3232#include <string>
    3333
     34// forward declarations
     35typedef unsigned int ALuint;
     36typedef int ALint;
     37
    3438namespace orxonox
    3539{
     
    5862
    5963    private:
    60         uint32_t loadOggFile(std::string filename);
    61         uint32_t source_;
    62         uint32_t buffer_;
     64        ALuint loadOggFile(std::string filename);
     65        ALuint source_;
     66        ALuint buffer_;
    6367        WorldEntity* entity_;
    6468
    65         int32_t getSourceState();
     69        ALint getSourceState();
    6670
    6771        static SoundManager* soundmanager_s;
Note: See TracChangeset for help on using the changeset viewer.