Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
DISCONTINUED:openSUSE:11.1:Update
chromium
Chromium-0.9-alut.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File Chromium-0.9-alut.patch of Package chromium
--- configure +++ configure @@ -158,7 +158,7 @@ ## set up other config.mak variables ###################################################################### GL_LIBS="-lglpng -lGL -lGLU -lpng -lz -lm" -AL_LIBS="-L../support/openal/lib -lopenal -ldl" +AL_LIBS="-L../support/openal/lib -lopenal -lalut -ldl" AL_CFLAGS="" ## write out config.mak --- src-setup/Audio.cpp +++ src-setup/Audio.cpp @@ -57,7 +57,7 @@ { fprintf(stderr, "stopping OpenAL..."); if(initialized) - alcDestroyContext(context_id); + alcDestroyContext((ALCcontext*)context_id); initialized = false; fprintf(stderr, "done.\n"); } @@ -78,7 +78,7 @@ ALCdevice *dev; dev = alcOpenDevice( NULL ); context_id = alcCreateContext(dev, NULL); - alcMakeContextCurrent(context_id); + alcMakeContextCurrent((ALCcontext*)context_id); #endif initialized = (bool)context_id; fprintf(stderr, "done.\n"); @@ -89,21 +89,21 @@ #ifndef _WIN32 alAttenuationScale = (void (*)(ALfloat param)) - alGetProcAddress((const ALubyte *)"alAttenuationScale_LOKI"); + alGetProcAddress((const ALchar *)"alAttenuationScale_LOKI"); if(alAttenuationScale == NULL) fprintf(stderr, "alAttenuationScale NOT present\n"); else alAttenuationScale(1.0); alutLoadMP3 = (ALboolean (*)(ALuint, ALvoid *, ALint)) - alGetProcAddress((const ALubyte *)"alutLoadMP3_LOKI"); + alGetProcAddress((const ALchar *)"alutLoadMP3_LOKI"); if(alutLoadMP3) fprintf(stderr, "alutLoadMP3_LOKI present\n"); else fprintf(stderr, "alutLoadMP3_LOKI NOT present\n"); alutLoadVorbis = (ALboolean (*)(ALuint, ALvoid *, ALint)) - alGetProcAddress((const ALubyte *)"alutLoadVorbis_LOKI"); + alGetProcAddress((const ALchar *)"alutLoadVorbis_LOKI"); if(alutLoadVorbis) fprintf(stderr, "alutLoadVorbis_LOKI present\n"); else @@ -285,6 +285,8 @@ ALsizei size, freq, bits; ALenum format; ALvoid *data; + ALboolean loop; + char nameBuffer[256]; struct stat sbuf; if(stat(filename, &sbuf) == -1) @@ -294,17 +296,11 @@ return false; } - retVal = alutLoadWAV(filename, &data, &format, &size, &bits, &freq); - if(retVal) - { - alBufferData (buffer[MusicGame], format, data, size, freq); - free(data); - } - else - { - sprintf(errorBuffer, "ERROR: alutLoadWAV failed for\n\"%s\"\nin Audio::loadWAV", filename); - fprintf(stderr, "%s\n", errorBuffer); - } + retVal = true ; // alutLoadWAV(filename, &data, &format, &size, &bits, &freq); + sprintf(nameBuffer, "%s", filename); + alutLoadWAVFile(nameBuffer,&format,&data,&size,&freq,&loop); + alBufferData(buffer[MusicGame],format,data,size,freq); + alutUnloadWAV(format,data,size,freq); } return retVal; } --- src/AudioOpenAL.cpp +++ src/AudioOpenAL.cpp @@ -52,8 +52,8 @@ //try to use OpenAL alc[GS]etAudioChannel extensions in linux... #ifdef __linux__ #define CD_VOLUME 1 -// #include <AL/alext.h> - #include <AL/alexttypes.h> + #include <AL/alext.h> +// #include <AL/alexttypes.h> #endif //__linux__ #endif //USE_SDL #endif @@ -159,7 +159,7 @@ alcDestroyContext((ALCcontext*)context_id); #else if(context_id) - alcDestroyContext(context_id); + alcDestroyContext((ALCcontext*)context_id); #endif fprintf(stderr, "done.\n"); @@ -201,7 +201,7 @@ ALCdevice *dev; dev = alcOpenDevice( NULL ); context_id = alcCreateContext(dev, NULL); - alcMakeContextCurrent(context_id); + alcMakeContextCurrent((ALCcontext*)context_id); #endif #endif @@ -311,7 +311,7 @@ //-- check AttenuationScale extension alAttenuationScale = (void (*)(ALfloat param)) - alGetProcAddress((ALubyte *)"alAttenuationScale_LOKI"); + alGetProcAddress((const ALchar *)"alAttenuationScale_LOKI"); if(alAttenuationScale == NULL) fprintf(stderr, "ATTENTION!! Could not load alAttenuationScale\n"); else @@ -319,9 +319,9 @@ //-- check Audio Channel extension alcGetAudioChannel = (float (*)(ALuint channel)) - alGetProcAddress((const ALubyte *)"alcGetAudioChannel_LOKI"); + alGetProcAddress((const ALchar *)"alcGetAudioChannel_LOKI"); alcSetAudioChannel = (void (*)(ALuint channel, ALfloat volume)) - alGetProcAddress((const ALubyte *)"alcSetAudioChannel_LOKI"); + alGetProcAddress((const ALchar *)"alcSetAudioChannel_LOKI"); #ifdef CD_VOLUME if(alcGetAudioChannel) origCDvolume = alcGetAudioChannel(ALC_CHAN_CD_LOKI); @@ -329,10 +329,10 @@ //-- check MP3 extension alutLoadMP3 = (ALboolean (*)(ALuint, ALvoid *, ALint)) - alGetProcAddress((const ALubyte *)"alutLoadMP3_LOKI"); + alGetProcAddress((const ALchar *)"alutLoadMP3_LOKI"); //-- check Ogg/Vorbis extension alutLoadVorbis = (ALboolean (*)(ALuint, ALvoid *, ALint)) - alGetProcAddress((const ALubyte *)"alutLoadVorbis_LOKI"); + alGetProcAddress((const ALchar *)"alutLoadVorbis_LOKI"); #endif //_WIN32 } @@ -472,6 +472,7 @@ ALsizei size, freq, bits; ALenum format; ALvoid *data; + ALboolean loop; for(i = 0; i < NumSoundTypes; i++) { @@ -482,9 +483,11 @@ else { #ifndef _WIN32 - alutLoadWAV(dataLoc(fileNames[i]), &data, &format, &size, &bits, &freq); - alBufferData (buffer[i], format, data, size, freq); - free(data); + char nameBuffer[256]; + sprintf(nameBuffer, "%s", dataLoc(fileNames[i])); + alutLoadWAVFile(nameBuffer,&format,&data,&size,&freq,&loop); + alBufferData(buffer[i],format,data,size,freq); + alutUnloadWAV(format,data,size,freq); #else //_WIN32 char nameBuffer[256]; sprintf(nameBuffer, "%s", dataLoc(fileNames[i])); @@ -847,13 +850,13 @@ ALsizei size, freq, bits; ALenum format; ALvoid *data; - retVal = alutLoadWAV(filename, &data, &format, &size, &bits, &freq); - if(retVal) - { - alBufferData (buffer[MusicGame], format, data, size, freq); - free(data); - } - return retVal; + ALboolean loop; + char nameBuffer[256]; + sprintf(nameBuffer, "%s", filename); + alutLoadWAVFile(nameBuffer,&format,&data,&size,&freq,&loop); + alBufferData(buffer[MusicGame],format,data,size,freq); + alutUnloadWAV(format,data,size,freq); + return true; #endif//USE_PLAYLIST }
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
