Attachment #35264 for bug #49596




    opengl_lib = ['GL', 'GLU']
    opengl_static = ['/usr/lib/libGL.a', '/usr/lib/libGLU.a']
    opengl_libpath = ['/usr/lib', '/usr/X11R6/lib']
    opengl_include = ['/usr/include/GL']
    # SDL library information
    sdl_env.ParseConfig ('sdl-config --cflags --libs')
    sdl_cflags = sdl_env.Dictionary()['CCFLAGS']

    qhull_include = ['#extern/qhull/include']
    # ODE library information
    ode_lib = ['ode']
    ode_libpath = ['/usr/lib']
    ode_include = ['/usr//include/ode']
    # Python library information
    python_lib = ['python%d.%d' % sys.version_info[0:2]]
    python_libpath = [sysconfig.get_python_lib (0, 1) + '/config']

    python_linkflags = Split (sysconfig.get_config_var('LINKFORSHARED'))
    # International support information
    ftgl_lib = ['ftgl']
    ftgl_libpath = ['/usr/lib']
    ftgl_include = ['/usr/include/FTGL']
    freetype_env.ParseConfig ('freetype-config --cflags --libs')
    freetype_lib = freetype_env.Dictionary()['LIBS']
    freetype_libpath = freetype_env.Dictionary()['LIBPATH']
    freetype_include = freetype_env.Dictionary()['CPPPATH']
    gettext_lib = []
    gettext_libpath = ['/usr/lib']
    gettext_include = []
    # OpenAL library information
    openal_lib = ['openal']
    openal_libpath = ['/usr/lib']
    openal_include = ['/usr/include/AL']

elif sys.platform == 'darwin':
    use_international = 'true'




				/* load the sample from memory? */
				if (size && memlocation)
				{
					m_buffers[buffer] = FSOUND_Sample_Load(buffer, (char*)memlocation, FSOUND_LOADMEMORY, 
									NULL, size);
					
					/* if the loading succeeded, fill the waveslot with info */
					if (m_buffers[buffer])

				/* or from file? */
				else
				{
					m_buffers[buffer] = FSOUND_Sample_Load(buffer, samplename.Ptr(), FSOUND_LOOP_NORMAL, NULL,
									NULL);
				}
				
#ifdef ONTKEVER

void SND_FmodDevice::SetDopplerVelocity(MT_Scalar dopplervelocity) const
{
	/* not supported by fmod */
	FSOUND_3D_SetDopplerFactor(dopplervelocity);
}



/* sets the global dopplerfactor */
void SND_FmodDevice::SetDopplerFactor(MT_Scalar dopplerfactor) const
{
	FSOUND_3D_SetDopplerFactor(dopplerfactor);
}




void SND_FmodDevice::NextFrame() const
{
	FSOUND_Update();
}



	case SND_LOOP_OFF:
		{
#ifndef __APPLE__
			char result = FSOUND_Sample_SetMode(m_sources[id], FSOUND_LOOP_OFF);
#else
			char result = FSOUND_SetLoopMode(m_sources[id], FSOUND_LOOP_OFF);
#endif

	case SND_LOOP_NORMAL:
		{
#ifndef __APPLE__
			char result = FSOUND_Sample_SetMode(m_sources[id], FSOUND_LOOP_NORMAL);
#else
			char result = FSOUND_SetLoopMode(m_sources[id], FSOUND_LOOP_NORMAL);
#endif

	case SND_LOOP_BIDIRECTIONAL:
		{
#ifndef __APPLE__
			char result = FSOUND_Sample_SetMode(m_sources[id], FSOUND_LOOP_BIDI);
#else
			char result = FSOUND_SetLoopMode(m_sources[id], FSOUND_LOOP_BIDI);
#endif

void SND_FmodDevice::PlayCD(int track) const
{
#ifndef __APPLE__
	signed char result = FSOUND_CD_Play(0, track);
#else
	signed char result = FSOUND_CD_Play(0, track);
#endif

void SND_FmodDevice::PauseCD(bool pause) const
{
#ifndef __APPLE__
	signed char result = FSOUND_CD_SetPaused(0, pause);
#else
	signed char result = FSOUND_CD_SetPaused(0, pause);
#endif

		if (pCD->GetUsed())
		{
#ifndef __APPLE__
			signed char result = FSOUND_CD_Stop(0);
#else
			signed char result = FSOUND_CD_Stop(0);
#endif

void SND_FmodDevice::SetCDPlaymode(int playmode) const
{
#ifndef __APPLE__
	FSOUND_CD_SetPlayMode(0, playmode);
#else
	FSOUND_CD_SetPlayMode(0, playmode);
#endif

{
	int volume = gain * 255;
#ifndef __APPLE__
	signed char result = FSOUND_CD_SetVolume(0, volume);
#else
	signed char result = FSOUND_CD_SetVolume(0, volume);
#endif

Return to bug 49596

Lines 65-71 Link Here

(-)blender-2.33a/SConstruct (-7 / +7 lines)
65	opengl_lib = ['GL', 'GLU']	65	opengl_lib = ['GL', 'GLU']
66	opengl_static = ['/usr/lib/libGL.a', '/usr/lib/libGLU.a']	66	opengl_static = ['/usr/lib/libGL.a', '/usr/lib/libGLU.a']
67	opengl_libpath = ['/usr/lib', '/usr/X11R6/lib']	67	opengl_libpath = ['/usr/lib', '/usr/X11R6/lib']
68	opengl_include = ['/usr/include']	68	opengl_include = ['/usr/include/GL']
69	# SDL library information	69	# SDL library information
70	sdl_env.ParseConfig ('sdl-config --cflags --libs')	70	sdl_env.ParseConfig ('sdl-config --cflags --libs')
71	sdl_cflags = sdl_env.Dictionary()['CCFLAGS']	71	sdl_cflags = sdl_env.Dictionary()['CCFLAGS']
Lines 81-88 Link Here
81	qhull_include = ['#extern/qhull/include']	81	qhull_include = ['#extern/qhull/include']
82	# ODE library information	82	# ODE library information
83	ode_lib = ['ode']	83	ode_lib = ['ode']
84	ode_libpath = ['#../lib/linux-glibc2.2.5-i386/ode/lib']	84	ode_libpath = ['/usr/lib']
85	ode_include = ['#../lib/linux-glibc2.2.5-i386/ode/include']	85	ode_include = ['/usr//include/ode']
86	# Python library information	86	# Python library information
87	python_lib = ['python%d.%d' % sys.version_info[0:2]]	87	python_lib = ['python%d.%d' % sys.version_info[0:2]]
88	python_libpath = [sysconfig.get_python_lib (0, 1) + '/config']	88	python_libpath = [sysconfig.get_python_lib (0, 1) + '/config']
Lines 90-108 Link Here
90	python_linkflags = Split (sysconfig.get_config_var('LINKFORSHARED'))	90	python_linkflags = Split (sysconfig.get_config_var('LINKFORSHARED'))
91	# International support information	91	# International support information
92	ftgl_lib = ['ftgl']	92	ftgl_lib = ['ftgl']
93	ftgl_libpath = ['#../lib/linux-glibc2.2.5-i386/ftgl/lib']	93	ftgl_libpath = ['/usr/lib']
94	ftgl_include = ['#../lib/linux-glibc2.2.5-i386/ftgl/include']	94	ftgl_include = ['/usr/include/FTGL']
95	freetype_env.ParseConfig ('freetype-config --cflags --libs')	95	freetype_env.ParseConfig ('freetype-config --cflags --libs')
96	freetype_lib = freetype_env.Dictionary()['LIBS']	96	freetype_lib = freetype_env.Dictionary()['LIBS']
97	freetype_libpath = freetype_env.Dictionary()['LIBPATH']	97	freetype_libpath = freetype_env.Dictionary()['LIBPATH']
98	freetype_include = freetype_env.Dictionary()['CPPPATH']	98	freetype_include = freetype_env.Dictionary()['CPPPATH']
99	gettext_lib = []	99	gettext_lib = []
100	gettext_libpath = []	100	gettext_libpath = ['/usr/lib']
101	gettext_include = []	101	gettext_include = []
102	# OpenAL library information	102	# OpenAL library information
103	openal_lib = ['openal']	103	openal_lib = ['openal']
104	openal_libpath = ['/usr/lib']	104	openal_libpath = ['/usr/lib']
105	openal_include = ['/usr/include']	105	openal_include = ['/usr/include/AL']
106		106
107	elif sys.platform == 'darwin':	107	elif sys.platform == 'darwin':
108	use_international = 'true'	108	use_international = 'true'

Lines 156-162 Link Here

(-)blender-2.33a/intern/SoundSystem/fmod/SND_FmodDevice.cpp (-13 / +15 lines)
156	/* load the sample from memory? */	156	/* load the sample from memory? */
157	if (size && memlocation)	157	if (size && memlocation)
158	{	158	{
159	m_buffers[buffer] = FSOUND_Sample_Load(buffer, (char*)memlocation, FSOUND_LOADMEMORY, size);	159	m_buffers[buffer] = FSOUND_Sample_Load(buffer, (char*)memlocation, FSOUND_LOADMEMORY,
		160	NULL, size);
160		161
161	/* if the loading succeeded, fill the waveslot with info */	162	/* if the loading succeeded, fill the waveslot with info */
162	if (m_buffers[buffer])	163	if (m_buffers[buffer])
Lines 179-185 Link Here
179	/* or from file? */	180	/* or from file? */
180	else	181	else
181	{	182	{
182	m_buffers[buffer] = FSOUND_Sample_Load(buffer, samplename.Ptr(), FSOUND_LOOP_NORMAL, NULL);	183	m_buffers[buffer] = FSOUND_Sample_Load(buffer, samplename.Ptr(), FSOUND_LOOP_NORMAL, NULL,
		184	NULL);
183	}	185	}
184		186
185	#ifdef ONTKEVER	187	#ifdef ONTKEVER
Lines 216-222 Link Here
216	void SND_FmodDevice::SetDopplerVelocity(MT_Scalar dopplervelocity) const	218	void SND_FmodDevice::SetDopplerVelocity(MT_Scalar dopplervelocity) const
217	{	219	{
218	/* not supported by fmod */	220	/* not supported by fmod */
219	FSOUND_3D_Listener_SetDopplerFactor(dopplervelocity);	221	FSOUND_3D_SetDopplerFactor(dopplervelocity);
220	}	222	}
221		223
222		224
Lines 224-230 Link Here
224	/* sets the global dopplerfactor */	226	/* sets the global dopplerfactor */
225	void SND_FmodDevice::SetDopplerFactor(MT_Scalar dopplerfactor) const	227	void SND_FmodDevice::SetDopplerFactor(MT_Scalar dopplerfactor) const
226	{	228	{
227	FSOUND_3D_Listener_SetDopplerFactor(dopplerfactor);	229	FSOUND_3D_SetDopplerFactor(dopplerfactor);
228	}	230	}
229		231
230		232
Lines 239-245 Link Here
239		241
240	void SND_FmodDevice::NextFrame() const	242	void SND_FmodDevice::NextFrame() const
241	{	243	{
242	FSOUND_3D_Update();	244	FSOUND_Update();
243	}	245	}
244		246
245		247
Lines 365-371 Link Here
365	case SND_LOOP_OFF:	367	case SND_LOOP_OFF:
366	{	368	{
367	#ifndef __APPLE__	369	#ifndef __APPLE__
368	char result = FSOUND_Sample_SetLoopMode(m_sources[id], FSOUND_LOOP_OFF);	370	char result = FSOUND_Sample_SetMode(m_sources[id], FSOUND_LOOP_OFF);
369	#else	371	#else
370	char result = FSOUND_SetLoopMode(m_sources[id], FSOUND_LOOP_OFF);	372	char result = FSOUND_SetLoopMode(m_sources[id], FSOUND_LOOP_OFF);
371	#endif	373	#endif
Lines 375-381 Link Here
375	case SND_LOOP_NORMAL:	377	case SND_LOOP_NORMAL:
376	{	378	{
377	#ifndef __APPLE__	379	#ifndef __APPLE__
378	char result = FSOUND_Sample_SetLoopMode(m_sources[id], FSOUND_LOOP_NORMAL);	380	char result = FSOUND_Sample_SetMode(m_sources[id], FSOUND_LOOP_NORMAL);
379	#else	381	#else
380	char result = FSOUND_SetLoopMode(m_sources[id], FSOUND_LOOP_NORMAL);	382	char result = FSOUND_SetLoopMode(m_sources[id], FSOUND_LOOP_NORMAL);
381	#endif	383	#endif
Lines 385-391 Link Here
385	case SND_LOOP_BIDIRECTIONAL:	387	case SND_LOOP_BIDIRECTIONAL:
386	{	388	{
387	#ifndef __APPLE__	389	#ifndef __APPLE__
388	char result = FSOUND_Sample_SetLoopMode(m_sources[id], FSOUND_LOOP_BIDI);	390	char result = FSOUND_Sample_SetMode(m_sources[id], FSOUND_LOOP_BIDI);
389	#else	391	#else
390	char result = FSOUND_SetLoopMode(m_sources[id], FSOUND_LOOP_BIDI);	392	char result = FSOUND_SetLoopMode(m_sources[id], FSOUND_LOOP_BIDI);
391	#endif	393	#endif
Lines 471-477 Link Here
471	void SND_FmodDevice::PlayCD(int track) const	473	void SND_FmodDevice::PlayCD(int track) const
472	{	474	{
473	#ifndef __APPLE__	475	#ifndef __APPLE__
474	signed char result = FSOUND_CD_Play(track);	476	signed char result = FSOUND_CD_Play(0, track);
475	#else	477	#else
476	signed char result = FSOUND_CD_Play(0, track);	478	signed char result = FSOUND_CD_Play(0, track);
477	#endif	479	#endif
Lines 486-492 Link Here
486	void SND_FmodDevice::PauseCD(bool pause) const	488	void SND_FmodDevice::PauseCD(bool pause) const
487	{	489	{
488	#ifndef __APPLE__	490	#ifndef __APPLE__
489	signed char result = FSOUND_CD_SetPaused(pause);	491	signed char result = FSOUND_CD_SetPaused(0, pause);
490	#else	492	#else
491	signed char result = FSOUND_CD_SetPaused(0, pause);	493	signed char result = FSOUND_CD_SetPaused(0, pause);
492	#endif	494	#endif
Lines 507-513 Link Here
507	if (pCD->GetUsed())	509	if (pCD->GetUsed())
508	{	510	{
509	#ifndef __APPLE__	511	#ifndef __APPLE__
510	signed char result = FSOUND_CD_Stop();	512	signed char result = FSOUND_CD_Stop(0);
511	#else	513	#else
512	signed char result = FSOUND_CD_Stop(0);	514	signed char result = FSOUND_CD_Stop(0);
513	#endif	515	#endif
Lines 524-530 Link Here
524	void SND_FmodDevice::SetCDPlaymode(int playmode) const	526	void SND_FmodDevice::SetCDPlaymode(int playmode) const
525	{	527	{
526	#ifndef __APPLE__	528	#ifndef __APPLE__
527	FSOUND_CD_SetPlayMode(playmode);	529	FSOUND_CD_SetPlayMode(0, playmode);
528	#else	530	#else
529	FSOUND_CD_SetPlayMode(0, playmode);	531	FSOUND_CD_SetPlayMode(0, playmode);
530	#endif	532	#endif
Lines 540-546 Link Here
540	{	542	{
541	int volume = gain * 255;	543	int volume = gain * 255;
542	#ifndef __APPLE__	544	#ifndef __APPLE__
543	signed char result = FSOUND_CD_SetVolume(volume);	545	signed char result = FSOUND_CD_SetVolume(0, volume);
544	#else	546	#else
545	signed char result = FSOUND_CD_SetVolume(0, volume);	547	signed char result = FSOUND_CD_SetVolume(0, volume);
546	#endif	548	#endif