Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 3, 2009, 10:23:32 PM (15 years ago)
Author:
rgrieder
Message:

Removed (commented) everything related to ALC (OpenAL library part).
This should fix the freeze problems when shutting down orxonox.

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

Legend:

Unmodified
Added
Removed
  • code/branches/presentation2/src/orxonox/sound/SoundManager.cc

    r6232 r6237  
    5555        RegisterRootObject(SoundManager);
    5656
     57/*
    5758        if (!alutInitWithoutContext(NULL, NULL))
     59*/
     60        if (!alutInit(NULL, NULL))
    5861            ThrowException(InitialisationFailed, "Sound: OpenAL ALUT error: " << alutGetErrorString(alutGetError()));
    5962        Loki::ScopeGuard alutExitGuard = Loki::MakeGuard(&alutExit);
    6063
     64        // Note: Everything related to ALC has been commented because there seem to be
     65        // very serious problems with the unloading sequence (complete freeze on Linux,
     66        // sometimes really everything gone, including response to any signals).
     67        // For the moment ALUT can do everything we need so far.
     68/*
    6169        COUT(3) << "Sound: OpenAL: Opening sound device..." << std::endl;
    6270        this->device_ = alcOpenDevice(NULL);
     
    8795        else
    8896            COUT(4) << "Sound: OpenAL ALUT supported MIME types: " << str << std::endl;
     97*/
    8998
    9099        GameMode::setPlaysSound(true);
    91100        // Disarm guards
    92101        alutExitGuard.Dismiss();
     102/*
    93103        closeDeviceGuard.Dismiss();
    94104        desroyContextGuard.Dismiss();
     105*/
    95106       
    96107        this->setVolumeInternal(1.0, SoundType::none);
     
    108119    {
    109120        GameMode::setPlaysSound(false);
     121/*
    110122        alcDestroyContext(this->context_);
    111123        alcCloseDevice(this->device_);
     124*/
    112125        alutExit();
    113126    }
  • code/branches/presentation2/src/orxonox/sound/SoundManager.h

    r6203 r6237  
    111111        float getVolumeInternal(SoundType::Value type);
    112112
     113/*
    113114        ALCdevice* device_;
    114115        ALCcontext* context_;
     116*/
    115117       
    116118        typedef std::list<std::pair<AmbientSound*, bool> > AmbientList;
Note: See TracChangeset for help on using the changeset viewer.