FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prepare for ALUT version 1.0

Browse Source
This commit is contained in:
ehofman
2005-10-25 13:06:25 +00:00
parent 3620be8dbc
commit 70faa252e7
2 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
simgear/sound/openal_test1.cxx
View File

@@ -115,11 +115,19 @@ int main( int argc, char *argv[] ) {
}
// Load the sample file
#if defined (__APPLE__)
alutLoadWAVFile( (ALbyte *)"jet.wav", &format, &data, &size, &freq );
#if defined(ALUT_API_MAJOR_VERSION) && ALUT_API_MAJOR_VERSION >= 1
buffer = alutCreateBufferFromFile("jet.wav");
if (buffer == AL_NONE) {
SG_LOG( SG_GENERAL, SG_ALERT, "Failed to buffer data.");
}
#else
# if defined (__APPLE__)
alutLoadWAVFile( (ALbyte *)"jet.wav", &format, &data, &size, &freq );
# else
alutLoadWAVFile( (ALbyte *)"jet.wav", &format, &data, &size, &freq, &loop );
#endif
# endif
if (alGetError() != AL_NO_ERROR) {
SG_LOG( SG_GENERAL, SG_ALERT, "Failed to load wav file.");
}
@@ -131,6 +139,7 @@ int main( int argc, char *argv[] ) {
}
alutUnloadWAV( format, data, size, freq );
#endif
alGenSources(1, &source);
if (alGetError() != AL_NO_ERROR) {

20
simgear/sound/sample_openal.cxx
View File

@@ -103,19 +103,32 @@ SGSoundSample::SGSoundSample( const char *path, const char *file,
}
// Load the sample file
#if defined (__APPLE__)
#if defined(ALUT_API_MAJOR_VERSION) && ALUT_API_MAJOR_VERSION >= 1
buffer = alutCreateBufferFromFile(samplepath.c_str());
if (buffer == AL_NONE) {
print_openal_error("constructor (alutCreateBufferFromFile)");
throw sg_exception("Failed to load wav file.");
}
#else
//
// pre 1.0 alut version
//
# if defined (__APPLE__)
alutLoadWAVFile( (ALbyte *)samplepath.c_str(),
&format, &data, &size, &freq );
#else
# else
alutLoadWAVFile( (ALbyte *)samplepath.c_str(),
&format, &data, &size, &freq, &loop );
#endif
# endif
if ( print_openal_error("constructor (alutLoadWAVFile)") ) {
throw sg_exception("Failed to load wav file.");
}
// Copy data to the internal OpenAL buffer
alBufferData( buffer, format, data, size, freq );
if ( print_openal_error("constructor (alBufferData)") ) {
throw sg_exception("Failed to buffer data.");
}
@@ -124,6 +137,7 @@ SGSoundSample::SGSoundSample( const char *path, const char *file,
alutUnloadWAV( format, data, size, freq );
data = NULL;
}
#endif
print_openal_error("constructor return");
}