Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 132819
Collapse All | Expand All

(-)file_not_specified_in_diff (-12 / +9 lines)
Line  Link Here
0
-- configure
0
++ configure
Lines 6908-6914 Link Here
6908
echo "$as_me:$LINENO: result: $ac_cv_lib_openal_alGetError" >&5
6908
echo "$as_me:$LINENO: result: $ac_cv_lib_openal_alGetError" >&5
6909
echo "${ECHO_T}$ac_cv_lib_openal_alGetError" >&6
6909
echo "${ECHO_T}$ac_cv_lib_openal_alGetError" >&6
6910
if test $ac_cv_lib_openal_alGetError = yes; then
6910
if test $ac_cv_lib_openal_alGetError = yes; then
6911
  soundlibs="-lopenal $soundlibs";cat >>confdefs.h <<\_ACEOF
6911
  soundlibs="-lopenal -lalut $soundlibs";cat >>confdefs.h <<\_ACEOF
6912
#define HAVE_LIBOPENAL 1
6912
#define HAVE_LIBOPENAL 1
6913
_ACEOF
6913
_ACEOF
6914
6914
6915
-- ultimatestunts/sndsample.cpp
6915
++ ultimatestunts/sndsample.cpp
Lines 96-105 Link Here
96
	//data (and default values)
96
	//data (and default values)
97
	void *wave = NULL;
97
	void *wave = NULL;
98
	ALsizei
98
	ALsizei
99
		format = AL_FORMAT_MONO16,
99
		size = 0;
100
		size = 0,
101
		bits = 0,
102
		freq = 44100;
103
100
104
	CString extension = realfile.mid(realfile.length() - 4);
101
	CString extension = realfile.mid(realfile.length() - 4);
105
	extension.toLower();
102
	extension.toLower();
Lines 108-114 Link Here
108
	{
105
	{
109
		//the loading proc
106
		//the loading proc
110
		ALboolean (*alutLoadVorbis)(ALuint, ALvoid *, ALint) =
107
		ALboolean (*alutLoadVorbis)(ALuint, ALvoid *, ALint) =
111
			(ALboolean (*)(ALuint, ALvoid *, ALint))alGetProcAddress((ALubyte *) VORBISFUNC);
108
			(ALboolean (*)(ALuint, ALvoid *, ALint))alGetProcAddress(VORBISFUNC);
112
109
113
		if(alutLoadVorbis == NULL)
110
		if(alutLoadVorbis == NULL)
114
		{
111
		{
Lines 134-140 Link Here
134
	{
131
	{
135
		//the loading proc
132
		//the loading proc
136
		ALboolean (*alutLoadMP3)(ALuint, ALvoid *, ALint) =
133
		ALboolean (*alutLoadMP3)(ALuint, ALvoid *, ALint) =
137
			(ALboolean (*)(ALuint, ALvoid *, ALint))alGetProcAddress((ALubyte *) MP3FUNC);
134
			(ALboolean (*)(ALuint, ALvoid *, ALint))alGetProcAddress(MP3FUNC);
138
135
139
		if(alutLoadMP3 == NULL)
136
		if(alutLoadMP3 == NULL)
140
		{
137
		{
Lines 158-166 Link Here
158
	}
155
	}
159
	else //default: load as wave file
156
	else //default: load as wave file
160
	{
157
	{
161
		alGenBuffers(1, &m_Buffer);
158
		m_Buffer = alutCreateBufferFromFile(realfile.c_str());
162
		alutLoadWAV(realfile.c_str(), &wave, &format, &size, &bits, &freq);
159
		if(m_Buffer == AL_NONE)
163
		alBufferData(m_Buffer, format, wave, size, freq);
160
			printf("alutCreateBufferFromFile failed\n");
164
	}
161
	}
165
162
166
	free(wave);
163
	free(wave);

Return to bug 132819