Commit Graph

30 Commits

Author SHA1 Message Date
Brecht Van Lommel
c8b4cf9206 2.50:
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19820:HEAD

Notes:
* Game and sequencer RNA, and sequencer header are now out of date
  a bit after changes in trunk.
* I didn't know how to port these bugfixes, most likely they are
  not needed anymore.
  * Fix "duplicate strip" always increase the user count for ipo.
  * IPO pinning on sequencer strips was lost during Undo.
2009-06-08 20:08:19 +00:00
Brecht Van Lommel
874c29cea8 2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19323:HEAD
Notes:
* blenderbuttons and ICON_SNAP_PEEL_OBJECT were not merged.
2009-04-20 15:06:46 +00:00
Campbell Barton
688db0f251 [#18260] FMOD Removal
from Jorg Muller (nexyon)

also removed references to CVS in install
2009-03-24 09:09:10 +00:00
Campbell Barton
86c25491e1 [#18257] Workaround for bug in freealut 1.1.0
by Jörg Müller (nexyon) 

Since this area is not maintained, I can only say it works on my system (linux/32bit)
And nexyon assured me he checked over this patch well.
Blender using the deprecated function is not great, but nexyon's bugfix would not be available until the next version of freealut so better to work around it by using the new function.

Please test game sounds play back on win32 and Mac, in cases that it worked in the first place.
2009-02-06 16:38:53 +00:00
Erwin Coumans
206cfe7955 avoid crash when game engine returns to Blender, and OpenAL sources haven't been initialized properly for some reason. 2008-09-13 05:24:52 +00:00
Chris Want
5d0a207ecb Patch from GSR that a) fixes a whole bunch of GPL/BL license
blocks that were previously missed; and b) greatly increase my
ohloh stats!
2008-04-16 22:40:48 +00:00
Benoit Bolsee
44314581dc Mem leak fixed in sound buffer & parent invert node 2008-03-01 19:29:01 +00:00
Chris Want
a119216a53 Crude test so that if openal comes from apple framework stuff, use the
headers <al.h>, <alc.h>, and <alut.h> instead of <AL/al.h>, <AL/alc.h>,
and <AL/alut.h>

(cmake generated makefiles now work out of the box on my intel mac)
2006-12-13 02:54:59 +00:00
Brecht Van Lommel
24446906bc Use ALsizei/GLsizei to fix compile errors on mac / gcc 4.x. 2006-01-29 21:29:14 +00:00
Tom Musgrove
2fbef6f9c9 ==compiling==
need this version to compile with cygwin...
2006-01-28 19:57:09 +00:00
Kent Mein
c693e01b8d Ton forgot a few modifications to the Scons and Makefile build systems.
These should make it so that other people can compile with OpenEXR support.

(I also added the OPENAL fix erwin commited to bf-blender since I
need it for my machine, and this syncs up the file)

Kent
2006-01-09 02:18:11 +00:00
Ton Roosendaal
205b6501a0 (Accidentally sent previous commit without message... is same stuff)
gcc4 error fixes for compiling in OSX Tiger

Also; make using python framework default in makefiles
2005-06-08 18:55:49 +00:00
Kent Mein
7811d7209a Bunch of gcc 4.0 warning fixes.
source/creator/creator.c
	changed ifdef's around fpe_handler to match when its actually used.

intern/SoundSystem/intern/SND_AudioDevice.cpp
	Changed: SND_SoundObject* oldobject = oldobject = pIdObject->GetSoundObject();
	to: SND_SoundObject* oldobject = pIdObject->GetSoundObject();

intern/SoundSystem/openal/SND_OpenALDevice.cpp
	removed unused var.

source/blender/blenkernel/intern/mball.c
	initalized a couple of vars that might have been used uninitalized.

The rest were changing types to match, most of them were something like
was short * should have been unsigned short *.

Kent
2005-04-27 11:52:50 +00:00
Jean-Luc Peurière
c78e44cdc5 big warning hunt commit
lot of casts, added prototypes, missing includes and some true errors
2005-03-09 19:45:59 +00:00
Kester Maddock
c635a0eead Fix loading of non-packed sounds for Linux. 2004-12-30 03:08:34 +00:00
Kester Maddock
5d04d876f7 Fix for bug #1875:
OpenAL (pthreads) was generating a SIGHUP at alcDestroyContext().

Fix by setting SIGHUP to ignore.
2004-12-05 00:50:55 +00:00
Jean-Luc Peurière
e4562134d2 fix for #1590, possible fix for #1849 (to be confirmed)
OpenAl is subtly different on each platform. Os X need the alutinit/exit stuff
2004-11-29 20:36:03 +00:00
Kent Mein
19a24abcb2 two more vars that were questionably not initalized...
Kent
2004-08-31 13:11:59 +00:00
Kester Maddock
8a52016501 Let the game engine manage it's own sound scene. This is to fix bug 1415 (Patch from Peter den Bak)
http://projects.blender.org/tracker/index.php?func=detail&aid=1415&group_id=9&atid=125
Also release the OpenAL device & context.  These were leaked before, and would cause an assertion.
2004-07-26 11:54:10 +00:00
Kester Maddock
ccc0e30fff Enable doppler on platforms other than WIN32. 2004-04-17 01:14:35 +00:00
Stefan Gartner
837da93f19 enable openal support for os x and linux-powerpc
as there is a conflict between openal and sdl (when compiled with cdrom
support), i had to disable support for cd playing using sdl on os x
for the time being.
2004-04-14 13:00:36 +00:00
Kester Maddock
2ccb9cf785 Added CD Audio support for OpenAL.
Updated Scons & Makefiles to cope
2004-04-02 13:15:18 +00:00
Michel Selten
05cec80893 * Updated the auto* build system to compile again.
SoundSystem has been moved from source/gameengine to intern. This was needed
  because functionality from SoundSystem was needed by
  source/blender/src/editsound.c.
* Removed the option for the openal check in configure.ac. It's needed now by
  SoundSystem
* Removed the functionality for checking if 'noaudio' was provied on the
  commandline. Now audio is default on.
2003-07-16 18:23:50 +00:00
Chris Want
14b4ed4e8d Jacques patch for initializing m_context as NULL 2003-07-01 00:53:26 +00:00
Frank van Beek
8dcdf3bf0b - replaced #elif with more correct version:
< #elif _WIN32
---
> #elif defined(_WIN32)
2003-01-04 18:17:50 +00:00
Frank van Beek
38e5b5899c - on windows alcGetError() has no arguments. On other platforms it does. 2003-01-04 16:46:49 +00:00
Kent Mein
e5341714b6 Shrunk the hack so it didn't get used in newer versions of OpenAL which
seems to be working.

Kent

(diff follows)

Index: SND_OpenALDevice.cpp
===================================================================
RCS file: /cvs01/blender/source/gameengine/SoundSystem/openal/SND_OpenALDevice.cpp,v
retrieving revision 1.4
diff -u -r1.4 SND_OpenALDevice.cpp
--- SND_OpenALDevice.cpp        2002/11/25 15:29:57     1.4
+++ SND_OpenALDevice.cpp        2002/12/20 19:26:04
@@ -59,7 +59,7 @@
 #include <fcntl.h>

 /* untill openal gets unified we need this hack for non-windows systems */
-#ifndef WIN32
+#if !defined(WIN32) && !defined(ALC_MAJOR_VERSION)
2002-12-20 19:27:39 +00:00
Kent Mein
209a2ede2c Last of the config.h mods...
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif

added to these files.

Kent
--
mein@cs.umn.edu
2002-11-25 15:29:57 +00:00
Kent Mein
716caf4d37 - ALenum alc_error = alcGetError(); // openal_2.14+
+               ALenum alc_error = alcGetError(NULL);   // openal_2.14+


Fix to get it to work with latest version of openal.

Kent
--
mein@cs.umn.edu
2002-11-12 15:26:05 +00:00
Hans Lambermont
12315f4d0e Initial revision 2002-10-12 11:37:38 +00:00