diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-07-26 17:56:31 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-07-26 17:56:31 +0400 |
| commit | 9077b8bffc6731062bbd6997379b4bf6badd13e2 (patch) | |
| tree | 641b4fdb97c201727107c398517233ca313d1f38 /intern/audaspace/OpenAL | |
| parent | c0373fb7ea2b6d36b57a7c43706626aa254c70b3 (diff) | |
3D Audio GSoC:
Main: Complete rewrite of the sequencer related audio code to support 3D Audio objects later and especially adressing the animation system problems (see mailing list if interested).
Note: Animation is not working yet, so with this commit volume animation doesn't work anymore, that's the next step.
Minor things:
* Changed AUD_Reference behaviour a little to be more usage safe.
* Fixed bug in AUD_I3DHandle: Missing virtual destructor
* Fixed enmus in AUD_Space.h
* Fixed a warning in rna_scene.c
* Removed an unneeded call in rna_sound.c
Diffstat (limited to 'intern/audaspace/OpenAL')
| -rw-r--r-- | intern/audaspace/OpenAL/AUD_OpenALDevice.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp b/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp index 684ad50792b..40fc8a55f03 100644 --- a/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp +++ b/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp @@ -1168,7 +1168,7 @@ AUD_Reference<AUD_IHandle> AUD_OpenALDevice::play(AUD_Reference<AUD_IReader> rea // check format if(specs.channels == AUD_CHANNELS_INVALID) - return NULL; + return AUD_Reference<AUD_IHandle>(); if(m_specs.format != AUD_FORMAT_FLOAT32) reader = new AUD_ConverterReader(reader, m_specs); @@ -1176,7 +1176,7 @@ AUD_Reference<AUD_IHandle> AUD_OpenALDevice::play(AUD_Reference<AUD_IReader> rea ALenum format; if(!getFormat(format, specs)) - return NULL; + return AUD_Reference<AUD_IHandle>(); lock(); alcSuspendContext(m_context); |