[Patch] Code update for new versions of ALUT

[someone972]

The following is the code that needs to be changed/added in order for the new version of ALUT to be used with OALWrapper. This is confirmed to work with ALUT 1.1.0.

In OAL_WAVSample.cpp line 54:

PHP Code: (Select All)

#if defined(__APPLE__)
    alutLoadWAVFile ( (ALbyte*) sFilename.c_str(), &mFormat, &pPCMBuffer, &lSize, &mlFrequency);
#else
    alutLoadWAVFile ( (ALbyte*) sFilename.c_str(), &mFormat, &pPCMBuffer, &lSize, &mlFrequency, AL_FALSE);
#endif 


Changes to:

PHP Code: (Select All)

#if defined(__APPLE__)
    pPCMBuffer = alutLoadMemoryFromFile(sFilename.c_str(), &mFormat, &lSize, &mlFrequency);
#else
    pPCMBuffer = alutLoadMemoryFromFile(sFilename.c_str(), &mFormat, &lSize, &mlFrequency);
#endif 


In order for alutLoadMemoryFromFile to work in the new API, ALUT must be initialized first. Therefore some code must be added to OAL_Device.cpp.

At the end of cOAL_Device::Init:

PHP Code: (Select All)

#ifdef WITH_ALUT
    if(!alutInitWithoutContext(NULL,NULL))
    {
        LogMsg("",eOAL_LogVerbose_None, eOAL_LogMsg_Error, "Error initializing ALUT\n");
        return false;
    }
#endif 


And just before the end in cOAL_Device::Close:

PHP Code: (Select All)

#ifdef WITH_ALUT
    LogMsg("",eOAL_LogVerbose_Low, eOAL_LogMsg_Info, "Exiting ALUT...\n" );
    if(!alutExit())
    {
        LogMsg("",eOAL_LogVerbose_None, eOAL_LogMsg_Error, "Error exiting ALUT!\n");
    }
#endif 


[Urkle]

Thanks... I'll take a look at that and confirm on Mac os x and Linux. What platform are you developing/testing on?

[someone972]

I'm testing on Windows XP with MinGW. I'm using Code::Blocks for the IDE.