]>
Commit | Line | Data |
---|---|---|
1041c0f7 | 1 | diff -ruN apricots-0.2.6./apricots/sampleio.cpp apricots-0.2.6/apricots/sampleio.cpp |
2 | --- apricots-0.2.6./apricots/sampleio.cpp 2003-08-06 01:21:22.000000000 +0200 | |
3 | +++ apricots-0.2.6/apricots/sampleio.cpp 2006-05-28 20:44:53.445515024 +0200 | |
4 | @@ -80,17 +80,12 @@ | |
5 | for (int i = 0; i < numsamples; i++){\r | |
6 | ALsizei freq;\r | |
7 | ALboolean fileok;\r | |
8 | - // Evil OpenAL portability fix done here\r | |
9 | -#ifdef _WIN32\r | |
10 | +\r | |
11 | ALenum format;\r | |
12 | ALboolean trash;\r | |
13 | alutLoadWAVFile(filenames[i],&format,&data,&filelen,&freq,&trash);\r | |
14 | fileok = (alGetError() == AL_NO_ERROR);\r | |
15 | -#else\r | |
16 | - ALsizei format;\r | |
17 | - ALsizei trash;\r | |
18 | - fileok = alutLoadWAV(filenames[i],&data,&format,&filelen,&trash,&freq);\r | |
19 | -#endif\r | |
20 | +\r | |
21 | if (!fileok){\r | |
22 | cerr << "sampleio: could not open " << filenames[i] << endl;\r | |
23 | exit(1);\r |