Group :: Games/Other
RPM: apricots
Main Changelog Spec Patches Sources Download Gear Bugs and FR Repocop
Patch: apricots-0.2.6-alut-sampleio.patch
Download
Download
--- apricots/sampleio.cpp 2008-08-26 12:40:09.000000000 -0500
+++ apricots/sampleio.cpp 2008-08-26 12:40:09.000000000 -0500
@@ -74,12 +74,12 @@
alListenerfv(AL_ORIENTATION, front );
// Load in samples
- ALvoid* data = malloc(5 * (512 * 3) * 1024);
+ //ALvoid* data = malloc(5 * (512 * 3) * 1024);
alGenBuffers(numsamples, samples);
for (int i = 0; i < numsamples; i++){
- ALsizei freq;
- ALboolean fileok;
+ //ALsizei freq;
+ //ALboolean fileok;
// Evil OpenAL portability fix done here
#ifdef _WIN32
ALenum format;
@@ -87,15 +87,17 @@
alutLoadWAVFile(filenames[i],&format,&data,&filelen,&freq,&trash);
fileok = (alGetError() == AL_NO_ERROR);
#else
- ALsizei format;
- ALsizei trash;
- fileok = alutLoadWAV(filenames[i],&data,&format,&filelen,&trash,&freq);
+ //ALsizei format;
+ //ALsizei trash;
+ //fileok = alutLoadWAV(filenames[i],&data,&format,&filelen,&trash,&freq);
+ samples[i] = alutCreateBufferFromFile(filenames[i]);
#endif
- if (!fileok){
+ //if (!fileok){
+ if (samples[i] == AL_NONE){
cerr << "sampleio: could not open " << filenames[i] << endl;
exit(1);
}
- alBufferData(samples[i], format, data, filelen, freq);
+ //alBufferData(samples[i], format, data, filelen, freq);
}
// Generate Sources
@@ -107,7 +109,7 @@
alSourcefv(sources[j], AL_ORIENTATION, back );
}
- free(data);
+ //free(data);
}