2.5: Sound branch merge!
authorJoerg Mueller <nexyon@gmail.com>
Sun, 9 Aug 2009 21:16:39 +0000 (21:16 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Sun, 9 Aug 2009 21:16:39 +0000 (21:16 +0000)
See mailing list for additional information.

179 files changed:
CMake/macros.cmake
CMakeLists.txt
config/darwin-config.py
config/irix6-config.py
config/linux2-config.py
config/linuxcross-config.py
config/openbsd3-config.py
config/sunos5-config.py
config/win32-mingw-config.py
config/win32-vc-config.py
config/win64-vc-config.py
intern/CMakeLists.txt
intern/Makefile
intern/SConscript
intern/audaspace/AUD_C-API.h [new file with mode: 0644]
intern/audaspace/CMakeLists.txt [new file with mode: 0644]
intern/audaspace/COPYING [new file with mode: 0644]
intern/audaspace/COPYING.LESSER [new file with mode: 0644]
intern/audaspace/FX/AUD_DelayFactory.cpp [new file with mode: 0644]
intern/audaspace/FX/AUD_DelayFactory.h [new file with mode: 0644]
intern/audaspace/FX/AUD_DelayReader.cpp [new file with mode: 0644]
intern/audaspace/FX/AUD_DelayReader.h [new file with mode: 0644]
intern/audaspace/FX/AUD_DoubleReader.cpp [new file with mode: 0644]
intern/audaspace/FX/AUD_DoubleReader.h [new file with mode: 0644]
intern/audaspace/FX/AUD_EffectFactory.cpp [new file with mode: 0644]
intern/audaspace/FX/AUD_EffectFactory.h [new file with mode: 0644]
intern/audaspace/FX/AUD_EffectReader.cpp [new file with mode: 0644]
intern/audaspace/FX/AUD_EffectReader.h [new file with mode: 0644]
intern/audaspace/FX/AUD_FaderFactory.cpp [new file with mode: 0644]
intern/audaspace/FX/AUD_FaderFactory.h [new file with mode: 0644]
intern/audaspace/FX/AUD_FaderReader.cpp [new file with mode: 0644]
intern/audaspace/FX/AUD_FaderReader.h [new file with mode: 0644]
intern/audaspace/FX/AUD_LimiterFactory.cpp [new file with mode: 0644]
intern/audaspace/FX/AUD_LimiterFactory.h [new file with mode: 0644]
intern/audaspace/FX/AUD_LimiterReader.cpp [new file with mode: 0644]
intern/audaspace/FX/AUD_LimiterReader.h [new file with mode: 0644]
intern/audaspace/FX/AUD_LoopFactory.cpp [new file with mode: 0644]
intern/audaspace/FX/AUD_LoopFactory.h [new file with mode: 0644]
intern/audaspace/FX/AUD_LoopReader.cpp [new file with mode: 0644]
intern/audaspace/FX/AUD_LoopReader.h [new file with mode: 0644]
intern/audaspace/FX/AUD_PingPongFactory.cpp [new file with mode: 0644]
intern/audaspace/FX/AUD_PingPongFactory.h [new file with mode: 0644]
intern/audaspace/FX/AUD_PitchFactory.cpp [new file with mode: 0644]
intern/audaspace/FX/AUD_PitchFactory.h [new file with mode: 0644]
intern/audaspace/FX/AUD_PitchReader.cpp [new file with mode: 0644]
intern/audaspace/FX/AUD_PitchReader.h [new file with mode: 0644]
intern/audaspace/FX/AUD_ReverseFactory.cpp [new file with mode: 0644]
intern/audaspace/FX/AUD_ReverseFactory.h [new file with mode: 0644]
intern/audaspace/FX/AUD_ReverseReader.cpp [new file with mode: 0644]
intern/audaspace/FX/AUD_ReverseReader.h [new file with mode: 0644]
intern/audaspace/FX/AUD_VolumeFactory.cpp [new file with mode: 0644]
intern/audaspace/FX/AUD_VolumeFactory.h [new file with mode: 0644]
intern/audaspace/FX/AUD_VolumeReader.cpp [new file with mode: 0644]
intern/audaspace/FX/AUD_VolumeReader.h [new file with mode: 0644]
intern/audaspace/Makefile [new file with mode: 0644]
intern/audaspace/OpenAL/AUD_OpenALDevice.cpp [new file with mode: 0644]
intern/audaspace/OpenAL/AUD_OpenALDevice.h [new file with mode: 0644]
intern/audaspace/SConscript [new file with mode: 0644]
intern/audaspace/SDL/AUD_SDLDevice.cpp [new file with mode: 0644]
intern/audaspace/SDL/AUD_SDLDevice.h [new file with mode: 0644]
intern/audaspace/SDL/AUD_SDLMixer.cpp [new file with mode: 0644]
intern/audaspace/SDL/AUD_SDLMixer.h [new file with mode: 0644]
intern/audaspace/SDL/AUD_SDLMixerFactory.cpp [new file with mode: 0644]
intern/audaspace/SDL/AUD_SDLMixerFactory.h [new file with mode: 0644]
intern/audaspace/SDL/AUD_SDLMixerReader.cpp [new file with mode: 0644]
intern/audaspace/SDL/AUD_SDLMixerReader.h [new file with mode: 0644]
intern/audaspace/SDL/Makefile [new file with mode: 0644]
intern/audaspace/SRC/AUD_SRCResampleFactory.cpp [new file with mode: 0644]
intern/audaspace/SRC/AUD_SRCResampleFactory.h [new file with mode: 0644]
intern/audaspace/SRC/AUD_SRCResampleReader.cpp [new file with mode: 0644]
intern/audaspace/SRC/AUD_SRCResampleReader.h [new file with mode: 0644]
intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp [new file with mode: 0644]
intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h [new file with mode: 0644]
intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp [new file with mode: 0644]
intern/audaspace/ffmpeg/AUD_FFMPEGReader.h [new file with mode: 0644]
intern/audaspace/ffmpeg/Makefile [new file with mode: 0644]
intern/audaspace/intern/AUD_Buffer.cpp [new file with mode: 0644]
intern/audaspace/intern/AUD_Buffer.h [new file with mode: 0644]
intern/audaspace/intern/AUD_BufferReader.cpp [new file with mode: 0644]
intern/audaspace/intern/AUD_BufferReader.h [new file with mode: 0644]
intern/audaspace/intern/AUD_C-API.cpp [new file with mode: 0644]
intern/audaspace/intern/AUD_ChannelMapperFactory.cpp [new file with mode: 0644]
intern/audaspace/intern/AUD_ChannelMapperFactory.h [new file with mode: 0644]
intern/audaspace/intern/AUD_ChannelMapperReader.cpp [new file with mode: 0644]
intern/audaspace/intern/AUD_ChannelMapperReader.h [new file with mode: 0644]
intern/audaspace/intern/AUD_ConverterFactory.cpp [new file with mode: 0644]
intern/audaspace/intern/AUD_ConverterFactory.h [new file with mode: 0644]
intern/audaspace/intern/AUD_ConverterFunctions.cpp [new file with mode: 0644]
intern/audaspace/intern/AUD_ConverterFunctions.h [new file with mode: 0644]
intern/audaspace/intern/AUD_ConverterReader.cpp [new file with mode: 0644]
intern/audaspace/intern/AUD_ConverterReader.h [new file with mode: 0644]
intern/audaspace/intern/AUD_FloatMixer.cpp [new file with mode: 0644]
intern/audaspace/intern/AUD_FloatMixer.h [new file with mode: 0644]
intern/audaspace/intern/AUD_I3DDevice.h [new file with mode: 0644]
intern/audaspace/intern/AUD_IDevice.h [new file with mode: 0644]
intern/audaspace/intern/AUD_IFactory.h [new file with mode: 0644]
intern/audaspace/intern/AUD_IMixer.h [new file with mode: 0644]
intern/audaspace/intern/AUD_IReader.h [new file with mode: 0644]
intern/audaspace/intern/AUD_MixerFactory.cpp [new file with mode: 0644]
intern/audaspace/intern/AUD_MixerFactory.h [new file with mode: 0644]
intern/audaspace/intern/AUD_NULLDevice.cpp [new file with mode: 0644]
intern/audaspace/intern/AUD_NULLDevice.h [new file with mode: 0644]
intern/audaspace/intern/AUD_ReadDevice.cpp [new file with mode: 0644]
intern/audaspace/intern/AUD_ReadDevice.h [new file with mode: 0644]
intern/audaspace/intern/AUD_Reference.h [new file with mode: 0644]
intern/audaspace/intern/AUD_ResampleFactory.h [new file with mode: 0644]
intern/audaspace/intern/AUD_SinusFactory.cpp [new file with mode: 0644]
intern/audaspace/intern/AUD_SinusFactory.h [new file with mode: 0644]
intern/audaspace/intern/AUD_SinusReader.cpp [new file with mode: 0644]
intern/audaspace/intern/AUD_SinusReader.h [new file with mode: 0644]
intern/audaspace/intern/AUD_SoftwareDevice.cpp [new file with mode: 0644]
intern/audaspace/intern/AUD_SoftwareDevice.h [new file with mode: 0644]
intern/audaspace/intern/AUD_SourceCaps.h [new file with mode: 0644]
intern/audaspace/intern/AUD_Space.h [new file with mode: 0644]
intern/audaspace/intern/AUD_StreamBufferFactory.cpp [new file with mode: 0644]
intern/audaspace/intern/AUD_StreamBufferFactory.h [new file with mode: 0644]
intern/audaspace/intern/Makefile [new file with mode: 0644]
source/blender/blenkernel/BKE_packedFile.h
source/blender/blenkernel/BKE_sequence.h
source/blender/blenkernel/BKE_sound.h
source/blender/blenkernel/BKE_writeavi.h
source/blender/blenkernel/BKE_writeffmpeg.h
source/blender/blenkernel/BKE_writeframeserver.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/packedFile.c
source/blender/blenkernel/intern/sca.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/sequence.c
source/blender/blenkernel/intern/sound.c
source/blender/blenkernel/intern/writeavi.c
source/blender/blenkernel/intern/writeffmpeg.c
source/blender/blenkernel/intern/writeframeserver.c
source/blender/blenlib/intern/bpath.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/CMakeLists.txt
source/blender/editors/animation/anim_ops.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/screen/screendump.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_logic/logic_window.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/space_sequencer/SConscript
source/blender/editors/space_sequencer/sequencer_add.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/editors/space_sequencer/sequencer_select.c
source/blender/makesdna/DNA_actuator_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_sequence_types.h
source/blender/makesdna/DNA_sound_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_sequence.c
source/blender/makesrna/intern/rna_sound.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/render/intern/source/pipeline.c
source/blender/windowmanager/intern/wm_init_exit.c
source/creator/CMakeLists.txt
source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Converter/CMakeLists.txt
source/gameengine/Converter/KX_ConvertActuators.cpp
source/gameengine/Converter/SConscript
source/gameengine/Ketsji/CMakeLists.txt
source/gameengine/Ketsji/KX_CDActuator.cpp
source/gameengine/Ketsji/KX_CDActuator.h
source/gameengine/Ketsji/KX_KetsjiEngine.cpp
source/gameengine/Ketsji/KX_KetsjiEngine.h
source/gameengine/Ketsji/KX_Scene.cpp
source/gameengine/Ketsji/KX_Scene.h
source/gameengine/Ketsji/KX_SoundActuator.cpp
source/gameengine/Ketsji/KX_SoundActuator.h
source/gameengine/Ketsji/SConscript
source/nan_definitions.mk
tools/Blender.py
tools/btools.py

index 8744fc2cdf9ba2662eeac4207c69d84e0c9f90ce..3f706e5ed957318e8ae5f9a49a6dd34f43216b92 100644 (file)
@@ -43,7 +43,7 @@ MACRO(SETUP_LIBDIRS)
     CMAKE_POLICY(SET CMP0003 NEW)
   endif(COMMAND cmake_policy)
   LINK_DIRECTORIES(${PYTHON_LIBPATH} ${SDL_LIBPATH} ${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${ICONV_LIBPATH} ${OPENEXR_LIBPATH} ${QUICKTIME_LIBPATH} ${FFMPEG_LIBPATH})
-  LINK_DIRECTORIES(${FREETYPE_LIBPATH})
+  LINK_DIRECTORIES(${FREETYPE_LIBPATH} ${LIBSAMPLERATE_LIBPATH})
   IF(WITH_INTERNATIONAL)
     LINK_DIRECTORIES(${GETTEXT_LIBPATH})
   ENDIF(WITH_INTERNATIONAL)
@@ -82,7 +82,7 @@ MACRO(SETUP_LIBLINKS
 
 
   TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS})
-  TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIB})
+  TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIB} ${LIBSAMPLERATE_LIB})
 
   # since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
 
index 6da0015d42747909c9a2758a8e48c9a433e4df4f..895af9d1a1c174881ed4ccf3a441ab7cb1dcd585 100644 (file)
@@ -165,6 +165,11 @@ IF(UNIX AND NOT APPLE)
          SET(FFTW3_LIBPATH ${FFTW3}/lib)
   ENDIF(WITH_FFTW3)
 
+  SET(LIBSAMPLERATE /usr)
+  SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
+  SET(LIBSAMPLERATE_LIB samplerate)
+  SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
+
   FIND_PACKAGE(JPEG REQUIRED)
 
   FIND_PACKAGE(PNG REQUIRED)
@@ -213,11 +218,11 @@ IF(WIN32)
   IF(CMAKE_CL_64)
     SET(WITH_OPENAL OFF)
   ELSE(CMAKE_CL_64)
-    #SET(WITH_OPENAL ON)
-    SET(OPENAL ${LIBDIR}/openal)
-    SET(OPENAL_INC ${OPENAL}/include ${OPENAL}/include/AL)
-    SET(OPENAL_LIB openal_static)
-    SET(OPENAL_LIBPATH ${OPENAL}/lib)
+       #SET(WITH_OPENAL ON)
+       SET(OPENAL ${LIBDIR}/openal)
+       SET(OPENAL_INC ${OPENAL}/include)
+       SET(OPENAL_LIB wrap_oal)
+       SET(OPENAL_LIBPATH ${OPENAL}/lib)
   ENDIF(CMAKE_CL_64)
 
   IF(CMAKE_CL_64)
@@ -286,15 +291,16 @@ IF(WIN32)
   SET(FFMPEG_LIB avcodec-52 avformat-52 avdevice-52 avutil-50 swscale-0)
   SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
 
+  SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
+  SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
+  SET(LIBSAMPLERATE_LIB libsamplerate)
+  SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
+
   IF(CMAKE_CL_64)
   SET(LLIBS kernel32 user32 vfw32 winmm ws2_32 )
   ELSE(CMAKE_CL_64)
   SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
   ENDIF(CMAKE_CL_64)
-  
-  IF(WITH_OPENAL)
-    SET(LLIBS ${LLIBS} dxguid)
-  ENDIF(WITH_OPENAL)
 
   SET(CMAKE_CXX_FLAGS_DEBUG "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
   SET(CMAKE_CXX_FLAGS_RELEASE "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
index d12d0234ddc8506bae77cd03bb22d85995081261..5e8d94fbaac9bd9ebb7285e70c1db12a1aea4868 100644 (file)
@@ -86,11 +86,6 @@ else:
 BF_QUIET = '1'
 WITH_BF_OPENMP = '0'
 
-# Note : should be true, but openal simply dont work on intel
-if MAC_PROC == 'i386':
-       WITH_BF_OPENAL = False
-else:
-       WITH_BF_OPENAL = True
 #different lib must be used  following version of gcc
 # for gcc 3.3
 #BF_OPENAL = LIBDIR + '/openal'
@@ -112,7 +107,7 @@ BF_CXX = '/usr'
 WITH_BF_STATICCXX = False
 BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
 
-BF_LIBSAMPLERATE = LIBDIR + '/SRC'
+BF_LIBSAMPLERATE = LIBDIR + '/samplerate'
 BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
 BF_LIBSAMPLERATE_LIB = 'samplerate'
 BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
@@ -206,11 +201,6 @@ BF_ICONV_INC = '${BF_ICONV}/include'
 BF_ICONV_LIB = 'iconv'
 #BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
 
-BF_LIBSAMPLERATE = LIBDIR + '/samplerate'
-BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
-BF_LIBSAMPLERATE_LIB = 'samplerate'
-BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
-
 # Mesa Libs should go here if your using them as well....
 WITH_BF_STATICOPENGL = True
 BF_OPENGL_LIB = 'GL GLU'
index 93d6506ccc74cbdb54bf4dc02b48ff67d3a01204..d38665f282abd9a410166aee023c09e5decf0d36 100644 (file)
@@ -24,6 +24,11 @@ BF_CXX = '/usr'
 WITH_BF_STATICCXX = 'false'
 BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
 
+BF_LIBSAMPLERATE = LCGDIR+'/samplerate'
+BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
+BF_LIBSAMPLERATE_LIB = 'samplerate'
+BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
+
 WITH_BF_SDL = 'true'
 BF_SDL = LCGDIR+'/sdl' #$(shell sdl-config --prefix)
 BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
index 62a7667d8e7928e63ffc40c9a2f628cb82da60d3..c1707a02cc4df3b9e6213db2ef5c2f04573309db 100644 (file)
@@ -22,6 +22,11 @@ BF_CXX = '/usr'
 WITH_BF_STATICCXX = False
 BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
 
+BF_LIBSAMPLERATE = '/usr'
+BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
+BF_LIBSAMPLERATE_LIB = 'samplerate'
+BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
+
 WITH_BF_SDL = True
 BF_SDL = '/usr' #$(shell sdl-config --prefix)
 BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
index 88ad0ddd14e9756899a5c86976df4639a67adfe9..a7ce2dc290834f1847f82f85e777c857419cb1d0 100644 (file)
@@ -22,6 +22,11 @@ BF_CXX = '/usr'
 WITH_BF_STATICCXX = False
 BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
 
+BF_LIBSAMPLERATE = LIBDIR + '/samplerate'
+BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
+BF_LIBSAMPLERATE_LIB = 'samplerate'
+BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
+
 WITH_BF_SDL = True
 BF_SDL = LIBDIR + '/sdl'
 BF_SDL_INC = '${BF_SDL}/include'
index 92f044394d6975da96cf10b474d5ecd30f74442b..95649321c07a8acc2d035b5dd9cf6957f3e7f7e8 100644 (file)
@@ -16,6 +16,11 @@ WITH_BF_OPENAL = False
 #BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 #BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
 
+BF_LIBSAMPLERATE = '/usr/local'
+BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
+BF_LIBSAMPLERATE_LIB = 'samplerate'
+BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
+
 WITH_BF_SDL = True
 BF_SDL = '/usr/local' #$(shell sdl-config --prefix)
 BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
index 6e970b9cab2ed0bab895f15d680b6d2f02e47840..8af30e4f4f3f5b34e4f7232bf08e6303ebcfbc7b 100644 (file)
@@ -22,6 +22,11 @@ BF_CXX = '/usr'
 WITH_BF_STATICCXX = False
 BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
 
+BF_LIBSAMPLERATE = '/usr/local'
+BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
+BF_LIBSAMPLERATE_LIB = 'samplerate'
+BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
+
 WITH_BF_SDL = True
 BF_SDL = '/usr/local' #$(shell sdl-config --prefix)
 BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
@@ -109,7 +114,7 @@ BF_ICONV_LIB = 'iconv'
 BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
 
 # enable ffmpeg  support
-WITH_BF_FFMPEG = False  # -DWITH_FFMPEG
+WITH_BF_FFMPEG = True # -DWITH_FFMPEG
 BF_FFMPEG = '/usr/local'
 BF_FFMPEG_INC = '${BF_FFMPEG}/include'
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
index 5711fa8e0a83bc0713c35634f8c09717d679dfe9..1570698d261ed4e000e9759ce77b4ca9f8810e20 100644 (file)
@@ -18,7 +18,7 @@ BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION[0]}${BF_PY
 WITH_BF_OPENAL = True
 BF_OPENAL = LIBDIR + '/openal'
 BF_OPENAL_INC = '${BF_OPENAL}/include'
-BF_OPENAL_LIB = 'OpenAL32 wrap_oal'
+BF_OPENAL_LIB = 'wrap_oal'
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
 WITH_BF_FFMPEG = False
@@ -26,6 +26,11 @@ BF_FFMPEG_LIB = 'avformat swscale avcodec avutil avdevice xvidcore x264'
 BF_FFMPEG_LIBPATH = LIBDIR + '/gcc/ffmpeg/lib'
 BF_FFMPEG_INC =  LIBDIR + '/gcc/ffmpeg/include'
 
+BF_LIBSAMPLERATE = LIBDIR + '/samplerate'
+BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
+BF_LIBSAMPLERATE_LIB = 'libsamplerate'
+BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
+
 WITH_BF_SDL = True
 BF_SDL = LIBDIR + '/sdl'
 BF_SDL_INC = '${BF_SDL}/include'
index 4e2a735243a613667aade50d913fe95565f1695f..bb1bc02ccdbdd2209534515a67647956eff2e39e 100644 (file)
@@ -17,8 +17,8 @@ BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
 
 WITH_BF_OPENAL = True
 BF_OPENAL = LIBDIR + '/openal'
-BF_OPENAL_INC = '${BF_OPENAL}/include ${BF_OPENAL}/include/AL '
-BF_OPENAL_LIB = 'OpenAL32 wrap_oal'
+BF_OPENAL_INC = '${BF_OPENAL}/include '
+BF_OPENAL_LIB = 'wrap_oal'
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
 # TODO - are these useful on win32?
@@ -32,6 +32,11 @@ BF_ICONV_INC = '${BF_ICONV}/include'
 BF_ICONV_LIB = 'iconv'
 BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
 
+BF_LIBSAMPLERATE = LIBDIR + '/samplerate'
+BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
+BF_LIBSAMPLERATE_LIB = 'libsamplerate'
+BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
+
 WITH_BF_SDL = True
 BF_SDL = LIBDIR + '/sdl'
 BF_SDL_INC = '${BF_SDL}/include'
index 56ea356715bfc15bbc6a0d574701d6ed151ceb53..ed08e578df8a2212265902643bcc7a20ad398eda 100644 (file)
@@ -17,8 +17,8 @@ BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
 
 WITH_BF_OPENAL = False 
 BF_OPENAL = LIBDIR + '/openal'
-BF_OPENAL_INC = '${BF_OPENAL}/include ${BF_OPENAL}/include/AL '
-BF_OPENAL_LIB = 'OpenAL32 wrap_oal'
+BF_OPENAL_INC = '${BF_OPENAL}/include '
+BF_OPENAL_LIB = 'wrap_oal'
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
 # TODO - are these useful on win32?
@@ -32,6 +32,11 @@ BF_ICONV_INC = '${BF_ICONV}/include'
 BF_ICONV_LIB = 'iconv'
 BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
 
+BF_LIBSAMPLERATE = LIBDIR + '/samplerate'
+BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
+BF_LIBSAMPLERATE_LIB = 'libsamplerate'
+BF_LIBSAMPLERATE_LIBPATH = '${BF_LIBSAMPLERATE}/lib'
+
 WITH_BF_SDL = True
 BF_SDL = LIBDIR + '/sdl'
 BF_SDL_INC = '${BF_SDL}/include'
index 71bd00f71eed0bfbedba17ddd4e96aed2771e432..f6877e3bce0d8280ac2a7905681b856a74699bae 100644 (file)
@@ -24,6 +24,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
+ADD_SUBDIRECTORY(audaspace)
 ADD_SUBDIRECTORY(SoundSystem)
 ADD_SUBDIRECTORY(string)
 ADD_SUBDIRECTORY(ghost)
index b559ce6978aa7addab0319dd2bd08b2d2eaface8..033e44b6e3d347d25ee7a31c33466d679903c0e0 100644 (file)
@@ -32,7 +32,7 @@ SOURCEDIR = intern
 # include nan_subdirs.mk
 
 ALLDIRS = string ghost guardedalloc moto container memutil
-ALLDIRS += decimation iksolver bsp SoundSystem opennl elbeem boolop smoke
+ALLDIRS += decimation iksolver bsp SoundSystem opennl elbeem boolop smoke audaspace
 
 all::
        @for i in $(ALLDIRS); do \
index bdbdc7fd6e93e45364c5356403b4e4839c829422..34b88eee3ff545e84aad5d9cfceaf97310760aef 100644 (file)
@@ -1,7 +1,8 @@
 #!/usr/bin/python
 Import ('env')
 
-SConscript(['SoundSystem/SConscript',
+SConscript(['audaspace/SConscript',
+            'SoundSystem/SConscript',
             'string/SConscript',
             'ghost/SConscript',
             'guardedalloc/SConscript',
diff --git a/intern/audaspace/AUD_C-API.h b/intern/audaspace/AUD_C-API.h
new file mode 100644 (file)
index 0000000..1ee4b33
--- /dev/null
@@ -0,0 +1,330 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#ifndef AUD_CAPI
+#define AUD_CAPI
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "intern/AUD_Space.h"
+
+typedef enum
+{
+       AUD_NULL_DEVICE = 0,
+       AUD_SDL_DEVICE,
+       AUD_OPENAL_DEVICE
+} AUD_DeviceType;
+
+typedef struct
+{
+       AUD_Specs specs;
+       float length;
+} AUD_SoundInfo;
+
+#ifndef AUD_CAPI_IMPLEMENTATION
+       typedef void AUD_Sound;
+       typedef void AUD_Handle;
+       typedef void AUD_Device;
+#endif
+
+/**
+ * Initializes an audio device.
+ * \param device The device type that should be used.
+ * \param specs The audio specification to be used.
+ * \param buffersize The buffersize for the device.
+ * \return Whether the device has been initialized.
+ */
+extern int AUD_init(AUD_DeviceType device, AUD_Specs specs, int buffersize);
+
+/**
+ * Returns a integer list with available sound devices. The last one is always
+ * AUD_NULL_DEVICE.
+ */
+extern int* AUD_enumDevices();
+
+/**
+ * Unitinitializes an audio device.
+ */
+extern void AUD_exit();
+
+/**
+ * Locks the playback device.
+ */
+extern void AUD_lock();
+
+/**
+ * Unlocks the device.
+ */
+extern void AUD_unlock();
+
+/**
+ * Returns information about a sound.
+ * \param sound The sound to get the info about.
+ * \return The AUD_SoundInfo structure with filled in data.
+ */
+extern AUD_SoundInfo AUD_getInfo(AUD_Sound* sound);
+
+/**
+ * Loads a sound file.
+ * \param filename The filename of the sound file.
+ * \return A handle of the sound file.
+ */
+extern AUD_Sound* AUD_load(const char* filename);
+
+/**
+ * Loads a sound file.
+ * \param buffer The buffer which contains the sound file.
+ * \param size The size of the buffer.
+ * \return A handle of the sound file.
+ */
+extern AUD_Sound* AUD_loadBuffer(unsigned char* buffer, int size);
+
+/**
+ * Buffers a sound.
+ * \param sound The sound to buffer.
+ * \return A handle of the sound buffer.
+ */
+extern AUD_Sound* AUD_bufferSound(AUD_Sound* sound);
+
+/**
+ * Delays a sound.
+ * \param sound The sound to dealy.
+ * \param delay The delay in seconds.
+ * \return A handle of the delayed sound.
+ */
+extern AUD_Sound* AUD_delaySound(AUD_Sound* sound, float delay);
+
+/**
+ * Limits a sound.
+ * \param sound The sound to limit.
+ * \param start The start time in seconds.
+ * \param end The stop time in seconds.
+ * \return A handle of the limited sound.
+ */
+extern AUD_Sound* AUD_limitSound(AUD_Sound* sound, float start, float end);
+
+/**
+ * Ping pongs a sound.
+ * \param sound The sound to ping pong.
+ * \return A handle of the ping pong sound.
+ */
+extern AUD_Sound* AUD_pingpongSound(AUD_Sound* sound);
+
+/**
+ * Loops a sound.
+ * \param sound The sound to loop.
+ * \return A handle of the looped sound.
+ */
+extern AUD_Sound* AUD_loopSound(AUD_Sound* sound);
+
+/**
+ * Stops a looping sound when the current playback finishes.
+ * \param handle The playback handle.
+ * \return Whether the handle is valid.
+ */
+extern int AUD_stopLoop(AUD_Handle* handle);
+
+/**
+ * Unloads a sound of any type.
+ * \param sound The handle of the sound.
+ */
+extern void AUD_unload(AUD_Sound* sound);
+
+/**
+ * Plays back a sound file.
+ * \param sound The handle of the sound file.
+ * \param keep When keep is true the sound source will not be deleted but set to
+ *             paused when its end has been reached.
+ * \return A handle to the played back sound.
+ */
+extern AUD_Handle* AUD_play(AUD_Sound* sound, int keep);
+
+/**
+ * Pauses a played back sound.
+ * \param handle The handle to the sound.
+ * \return Whether the handle has been playing or not.
+ */
+extern int AUD_pause(AUD_Handle* handle);
+
+/**
+ * Resumes a paused sound.
+ * \param handle The handle to the sound.
+ * \return Whether the handle has been paused or not.
+ */
+extern int AUD_resume(AUD_Handle* handle);
+
+/**
+ * Stops a playing or paused sound.
+ * \param handle The handle to the sound.
+ * \return Whether the handle has been valid or not.
+ */
+extern int AUD_stop(AUD_Handle* handle);
+
+/**
+ * Sets the end behaviour of a playing or paused sound.
+ * \param handle The handle to the sound.
+ * \param keep When keep is true the sound source will not be deleted but set to
+ *             paused when its end has been reached.
+ * \return Whether the handle has been valid or not.
+ */
+extern int AUD_setKeep(AUD_Handle* handle, int keep);
+
+/**
+ * Seeks a playing or paused sound.
+ * \param handle The handle to the sound.
+ * \param seekTo From where the sound file should be played back in seconds.
+ * \return Whether the handle has been valid or not.
+ */
+extern int AUD_seek(AUD_Handle* handle, float seekTo);
+
+/**
+ * Retrieves the playback position of a handle.
+ * \return The current playback position in seconds or 0.0 if the handle is
+ *         invalid.
+ */
+extern float AUD_getPosition(AUD_Handle* handle);
+
+/**
+ * Returns the status of a playing, paused or stopped sound.
+ * \param handle The handle to the sound.
+ * \return The status of the sound behind the handle.
+ */
+extern AUD_Status AUD_getStatus(AUD_Handle* handle);
+
+/**
+ * Plays a 3D sound.
+ * \param sound The handle of the sound file.
+ * \param keep When keep is true the sound source will not be deleted but set to
+ *             paused when its end has been reached.
+ * \return A handle to the played back sound.
+ * \note The factory must provide a mono (single channel) source and the device
+ *       must support 3D audio, otherwise the sound is played back normally.
+ */
+extern AUD_Handle* AUD_play3D(AUD_Sound* sound, int keep);
+
+/**
+ * Updates the listener 3D data.
+ * \param data The 3D data.
+ * \return Whether the action succeeded.
+ */
+extern int AUD_updateListener(AUD_3DData* data);
+
+/**
+ * Sets a 3D device setting.
+ * \param setting The setting type.
+ * \param value The new setting value.
+ * \return Whether the action succeeded.
+ */
+extern int AUD_set3DSetting(AUD_3DSetting setting, float value);
+
+/**
+ * Retrieves a 3D device setting.
+ * \param setting The setting type.
+ * \return The setting value.
+ */
+extern float AUD_get3DSetting(AUD_3DSetting setting);
+
+/**
+ * Updates a listeners 3D data.
+ * \param handle The source handle.
+ * \param data The 3D data.
+ * \return Whether the action succeeded.
+ */
+extern int AUD_update3DSource(AUD_Handle* handle, AUD_3DData* data);
+
+/**
+ * Sets a 3D source setting.
+ * \param handle The source handle.
+ * \param setting The setting type.
+ * \param value The new setting value.
+ * \return Whether the action succeeded.
+ */
+extern int AUD_set3DSourceSetting(AUD_Handle* handle,
+                                                                 AUD_3DSourceSetting setting, float value);
+
+/**
+ * Retrieves a 3D source setting.
+ * \param handle The source handle.
+ * \param setting The setting type.
+ * \return The setting value.
+ */
+extern float AUD_get3DSourceSetting(AUD_Handle* handle,
+                                                                       AUD_3DSourceSetting setting);
+
+/**
+ * Sets the volume of a played back sound.
+ * \param handle The handle to the sound.
+ * \param volume The new volume, must be between 0.0 and 1.0.
+ * \return Whether the action succeeded.
+ */
+extern int AUD_setSoundVolume(AUD_Handle* handle, float volume);
+
+/**
+ * Sets the pitch of a played back sound.
+ * \param handle The handle to the sound.
+ * \param pitch The new pitch.
+ * \return Whether the action succeeded.
+ */
+extern int AUD_setSoundPitch(AUD_Handle* handle, float pitch);
+
+/**
+ * Opens a read device, with which audio data can be read.
+ * \param specs The specification of the audio data.
+ * \return A device handle.
+ */
+extern AUD_Device* AUD_openReadDevice(AUD_Specs specs);
+
+/**
+ * Plays back a sound file through a read device.
+ * \param device The read device.
+ * \param sound The handle of the sound file.
+ * \return Whether the sound could be played back.
+ */
+extern int AUD_playDevice(AUD_Device* device, AUD_Sound* sound);
+
+/**
+ * Reads the next samples into the supplied buffer.
+ * \param device The read device.
+ * \param buffer The target buffer.
+ * \param length The length in samples to be filled.
+ * \return True if the reading succeeded, false if there are no sounds
+ *         played back currently, in that case the buffer is filled with
+ *         silence.
+ */
+extern int AUD_readDevice(AUD_Device* device, sample_t* buffer, int length);
+
+/**
+ * Closes a read device.
+ * \param device The read device.
+ */
+extern void AUD_closeReadDevice(AUD_Device* device);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif //AUD_CAPI
diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt
new file mode 100644 (file)
index 0000000..c0716e2
--- /dev/null
@@ -0,0 +1,52 @@
+# $Id$
+# ***** BEGIN LGPL LICENSE BLOCK *****
+#
+# Copyright 2009 Jörg Hermann Müller
+#
+# This file is part of AudaSpace.
+#
+# AudaSpace is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# AudaSpace is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+#
+# ***** END LGPL LICENSE BLOCK *****
+
+SET(INC . intern FX SRC ${PTHREADS_INC} ${LIBSAMPLERATE_INC})
+
+FILE(GLOB SRC intern/*.cpp intern/*.h FX/*.cpp SRC/*.cpp)
+
+IF(WITH_FFMPEG)
+  SET(INC ${INC} ffmpeg ${FFMPEG_INC})
+  FILE(GLOB FFMPEGSRC ffmpeg/*.cpp)
+  ADD_DEFINITIONS(-DWITH_FFMPEG)
+ENDIF(WITH_FFMPEG)
+
+IF(WITH_SDL)
+  SET(INC ${INC} SDL ${SDL_INC})
+  FILE(GLOB SDLSRC SDL/*.cpp)
+  ADD_DEFINITIONS(-DWITH_SDL)
+ENDIF(WITH_SDL)
+
+IF(WITH_OPENAL)
+  SET(INC ${INC} OpenAL ${OPENAL_INC})
+  FILE(GLOB OPENALSRC OpenAL/*.cpp)
+  ADD_DEFINITIONS(-DWITH_OPENAL)
+
+  STRING(REGEX MATCH ".*ramework.*" FRAMEWORK ${OPENAL_INC})
+  IF(FRAMEWORK)
+    ADD_DEFINITIONS(-DAPPLE_FRAMEWORK_FIX)
+  ENDIF(FRAMEWORK)
+ENDIF(WITH_OPENAL)
+
+SET(SRC ${SRC} ${FFMPEGSRC} ${SDLSRC} ${OPENALSRC})
+
+BLENDERLIB(bf_audaspace "${SRC}" "${INC}")
diff --git a/intern/audaspace/COPYING b/intern/audaspace/COPYING
new file mode 100644 (file)
index 0000000..94a9ed0
--- /dev/null
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/intern/audaspace/COPYING.LESSER b/intern/audaspace/COPYING.LESSER
new file mode 100644 (file)
index 0000000..cca7fc2
--- /dev/null
@@ -0,0 +1,165 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/intern/audaspace/FX/AUD_DelayFactory.cpp b/intern/audaspace/FX/AUD_DelayFactory.cpp
new file mode 100644 (file)
index 0000000..25ce4fa
--- /dev/null
@@ -0,0 +1,58 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#include "AUD_DelayFactory.h"
+#include "AUD_DelayReader.h"
+#include "AUD_Space.h"
+
+AUD_DelayFactory::AUD_DelayFactory(AUD_IFactory* factory, float delay) :
+               AUD_EffectFactory(factory),
+               m_delay(delay) {}
+
+AUD_DelayFactory::AUD_DelayFactory(float delay) :
+               AUD_EffectFactory(0),
+               m_delay(delay) {}
+
+float AUD_DelayFactory::getDelay()
+{
+       return m_delay;
+}
+
+void AUD_DelayFactory::setDelay(float delay)
+{
+       m_delay = delay;
+}
+
+AUD_IReader* AUD_DelayFactory::createReader()
+{
+       AUD_IReader* reader = getReader();
+
+       if(reader != 0)
+       {
+               reader = new AUD_DelayReader(reader, m_delay); AUD_NEW("reader")
+       }
+
+       return reader;
+}
diff --git a/intern/audaspace/FX/AUD_DelayFactory.h b/intern/audaspace/FX/AUD_DelayFactory.h
new file mode 100644 (file)
index 0000000..5ad4b9a
--- /dev/null
@@ -0,0 +1,70 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#ifndef AUD_DELAYFACTORY
+#define AUD_DELAYFACTORY
+
+#include "AUD_EffectFactory.h"
+
+/**
+ * This factory plays another factory delayed.
+ */
+class AUD_DelayFactory : public AUD_EffectFactory
+{
+private:
+       /**
+        * The delay in samples.
+        */
+       float m_delay;
+
+public:
+       /**
+        * Creates a new delay factory.
+        * \param factory The input factory.
+        * \param delay The desired delay in seconds.
+        */
+       AUD_DelayFactory(AUD_IFactory* factory = 0, float delay = 0);
+
+       /**
+        * Creates a new delay factory.
+        * \param delay The desired delay in seconds.
+        */
+       AUD_DelayFactory(float delay);
+
+       /**
+        * Returns the delay in seconds.
+        */
+       float getDelay();
+
+       /**
+        * Sets the delay.
+        * \param delay The new delay value in seconds.
+        */
+       void setDelay(float delay);
+
+       virtual AUD_IReader* createReader();
+};
+
+#endif //AUD_DELAYFACTORY
diff --git a/intern/audaspace/FX/AUD_DelayReader.cpp b/intern/audaspace/FX/AUD_DelayReader.cpp
new file mode 100644 (file)
index 0000000..38d3b89
--- /dev/null
@@ -0,0 +1,111 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#include "AUD_DelayReader.h"
+#include "AUD_Buffer.h"
+
+#include <cstring>
+
+AUD_DelayReader::AUD_DelayReader(AUD_IReader* reader, float delay) :
+               AUD_EffectReader(reader)
+{
+       m_delay = (int)(delay * reader->getSpecs().rate);
+       m_remdelay = m_delay;
+       m_buffer = new AUD_Buffer(); AUD_NEW("buffer")
+}
+
+AUD_DelayReader::~AUD_DelayReader()
+{
+       delete m_buffer; AUD_DELETE("buffer")
+}
+
+void AUD_DelayReader::seek(int position)
+{
+       if(position < 0)
+               return;
+
+       if(position < m_delay)
+       {
+               m_remdelay = m_delay - position;
+               m_reader->seek(0);
+       }
+       else
+       {
+               m_remdelay = 0;
+               m_reader->seek(position - m_delay);
+       }
+}
+
+int AUD_DelayReader::getLength()
+{
+       int len = m_reader->getLength();
+       if(len < 0)
+               return len;
+       return len+m_delay;
+}
+
+int AUD_DelayReader::getPosition()
+{
+       if(m_remdelay > 0)
+               return m_delay-m_remdelay;
+       return m_reader->getPosition() + m_delay;
+}
+
+void AUD_DelayReader::read(int & length, sample_t* & buffer)
+{
+       if(m_remdelay > 0)
+       {
+               int samplesize = AUD_SAMPLE_SIZE(m_reader->getSpecs());
+
+               if(m_buffer->getSize() < length*samplesize)
+                       m_buffer->resize(length*samplesize);
+
+               if(length > m_remdelay)
+               {
+                       if(getSpecs().format == AUD_FORMAT_U8)
+                               memset(m_buffer->getBuffer(), 0x80, m_remdelay*samplesize);
+                       else
+                               memset(m_buffer->getBuffer(), 0, m_remdelay*samplesize);
+                       int len = length - m_remdelay;
+                       m_reader->read(len, buffer);
+                       memcpy(m_buffer->getBuffer()+m_remdelay*samplesize,
+                                  buffer, len*samplesize);
+                       if(len < length-m_remdelay)
+                               length = m_remdelay + len;
+                       m_remdelay = 0;
+               }
+               else
+               {
+                       if(getSpecs().format == AUD_FORMAT_U8)
+                               memset(m_buffer->getBuffer(), 0x80, length*samplesize);
+                       else
+                               memset(m_buffer->getBuffer(), 0, length*samplesize);
+                       m_remdelay -= length;
+               }
+               buffer = m_buffer->getBuffer();
+       }
+       else
+               m_reader->read(length, buffer);
+}
diff --git a/intern/audaspace/FX/AUD_DelayReader.h b/intern/audaspace/FX/AUD_DelayReader.h
new file mode 100644 (file)
index 0000000..4662b45
--- /dev/null
@@ -0,0 +1,73 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#ifndef AUD_DELAYREADER
+#define AUD_DELAYREADER
+
+#include "AUD_EffectReader.h"
+class AUD_Buffer;
+
+/**
+ * This class reads another reader and changes it's delay.
+ */
+class AUD_DelayReader : public AUD_EffectReader
+{
+private:
+       /**
+        * The playback buffer.
+        */
+       AUD_Buffer *m_buffer;
+
+       /**
+        * The delay level.
+        */
+       int m_delay;
+
+       /**
+        * The remaining delay for playback.
+        */
+       int m_remdelay;
+
+public:
+       /**
+        * Creates a new delay reader.
+        * \param reader The reader to read from.
+        * \param delay The delay in seconds.
+        * \exception AUD_Exception Thrown if the reader specified is NULL.
+        */
+       AUD_DelayReader(AUD_IReader* reader, float delay);
+
+       /**
+        * Destroys the reader.
+        */
+       virtual ~AUD_DelayReader();
+
+       virtual void seek(int position);
+       virtual int getLength();
+       virtual int getPosition();
+       virtual void read(int & length, sample_t* & buffer);
+};
+
+#endif //AUD_DELAYREADER
diff --git a/intern/audaspace/FX/AUD_DoubleReader.cpp b/intern/audaspace/FX/AUD_DoubleReader.cpp
new file mode 100644 (file)
index 0000000..181e394
--- /dev/null
@@ -0,0 +1,158 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#include "AUD_DoubleReader.h"
+#include "AUD_Buffer.h"
+
+#include <cstring>
+
+AUD_DoubleReader::AUD_DoubleReader(AUD_IReader* reader1,
+                                                                  AUD_IReader* reader2) :
+               m_reader1(reader1), m_reader2(reader2)
+{
+       try
+       {
+               if(!reader1)
+                       AUD_THROW(AUD_ERROR_READER);
+
+               if(!reader2)
+                       AUD_THROW(AUD_ERROR_READER);
+
+               AUD_Specs s1, s2;
+               s1 = reader1->getSpecs();
+               s2 = reader2->getSpecs();
+               if(memcmp(&s1, &s2, sizeof(AUD_Specs)) != 0)
+                       AUD_THROW(AUD_ERROR_READER);
+       }
+
+       catch(AUD_Exception e)
+       {
+               if(reader1)
+               {
+                       delete reader1; AUD_DELETE("reader")
+               }
+               if(reader2)
+               {
+                       delete reader2; AUD_DELETE("reader")
+               }
+
+               throw;
+       }
+
+       m_buffer = new AUD_Buffer(); AUD_NEW("buffer")
+       m_finished1 = false;
+}
+
+AUD_DoubleReader::~AUD_DoubleReader()
+{
+       delete m_reader1; AUD_DELETE("reader")
+       delete m_reader2; AUD_DELETE("reader")
+       delete m_buffer; AUD_DELETE("buffer")
+}
+
+bool AUD_DoubleReader::isSeekable()
+{
+       return false;
+}
+
+void AUD_DoubleReader::seek(int position)
+{
+       int length1 = m_reader1->getLength();
+
+       if(position < 0)
+               position = 0;
+
+       if(position < length1)
+       {
+               m_reader1->seek(position);
+               m_reader2->seek(0);
+               m_finished1 = false;
+       }
+       else
+       {
+               m_reader2->seek(position-length1);
+               m_finished1 = true;
+       }
+}
+
+int AUD_DoubleReader::getLength()
+{
+       int len1 = m_reader1->getLength();
+       int len2 = m_reader2->getLength();
+       if(len1 < 0 || len2 < 0)
+               return -1;
+       return len1 + len2;
+}
+
+int AUD_DoubleReader::getPosition()
+{
+       return m_reader1->getPosition() + m_reader2->getPosition();
+}
+
+AUD_Specs AUD_DoubleReader::getSpecs()
+{
+       return m_reader1->getSpecs();
+}
+
+AUD_ReaderType AUD_DoubleReader::getType()
+{
+       if(m_reader1->getType() == AUD_TYPE_BUFFER &&
+          m_reader2->getType() == AUD_TYPE_BUFFER)
+               return AUD_TYPE_BUFFER;
+       return AUD_TYPE_STREAM;
+}
+
+bool AUD_DoubleReader::notify(AUD_Message &message)
+{
+       return m_reader1->notify(message) | m_reader2->notify(message);
+}
+
+void AUD_DoubleReader::read(int & length, sample_t* & buffer)
+{
+       if(!m_finished1)
+       {
+               int len = length;
+               m_reader1->read(len, buffer);
+               if(len < length)
+               {
+                       int samplesize = AUD_SAMPLE_SIZE(m_reader1->getSpecs());
+                       if(m_buffer->getSize() < length * samplesize)
+                               m_buffer->resize(length * samplesize);
+                       memcpy(m_buffer->getBuffer(), buffer, len*samplesize);
+                       len = length - len;
+                       length -= len;
+                       m_reader2->read(len, buffer);
+                       memcpy(m_buffer->getBuffer() + length*samplesize,
+                                  buffer, len*samplesize);
+                       length += len;
+                       buffer = m_buffer->getBuffer();
+                       m_finished1 = true;
+               }
+       }
+       else
+       {
+               m_reader2->read(length, buffer);
+       }
+}
diff --git a/intern/audaspace/FX/AUD_DoubleReader.h b/intern/audaspace/FX/AUD_DoubleReader.h
new file mode 100644 (file)
index 0000000..d82b81e
--- /dev/null
@@ -0,0 +1,83 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#ifndef AUD_DOUBLEREADER
+#define AUD_DOUBLEREADER
+
+#include "AUD_IReader.h"
+class AUD_Buffer;
+
+/**
+ * This reader plays two readers with the same specs sequently.
+ */
+class AUD_DoubleReader : public AUD_IReader
+{
+private:
+       /**
+        * The first reader.
+        */
+       AUD_IReader* m_reader1;
+
+       /**
+        * The second reader.
+        */
+       AUD_IReader* m_reader2;
+
+       /**
+        * Whether we've reached the end of the first reader.
+        */
+       bool m_finished1;
+
+       /**
+        * The playback buffer for the intersecting part.
+        */
+       AUD_Buffer* m_buffer;
+
+public:
+       /**
+        * Creates a new ping pong reader.
+        * \param reader1 The first reader to read from.
+        * \param reader2 The second reader to read from.
+        * \exception AUD_Exception Thrown if one of the reader specified is NULL
+        *             or the specs from the readers differ.
+        */
+       AUD_DoubleReader(AUD_IReader* reader1, AUD_IReader* reader2);
+
+       /**
+        * Destroys the reader.
+        */
+       virtual ~AUD_DoubleReader();
+
+       virtual bool isSeekable();
+       virtual void seek(int position);
+       virtual int getLength();
+       virtual int getPosition();
+       virtual AUD_Specs getSpecs();
+       virtual AUD_ReaderType getType();
+       virtual bool notify(AUD_Message &message);
+       virtual void read(int & length, sample_t* & buffer);
+};
+
+#endif //AUD_DOUBLEREADER
diff --git a/intern/audaspace/FX/AUD_EffectFactory.cpp b/intern/audaspace/FX/AUD_EffectFactory.cpp
new file mode 100644 (file)
index 0000000..8824994
--- /dev/null
@@ -0,0 +1,50 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#include "AUD_EffectFactory.h"
+#include "AUD_IReader.h"
+
+AUD_IReader* AUD_EffectFactory::getReader()
+{
+       if(m_factory != 0)
+               return m_factory->createReader();
+
+       return 0;
+}
+
+AUD_EffectFactory::AUD_EffectFactory(AUD_IFactory* factory)
+{
+       m_factory = factory;
+}
+
+void AUD_EffectFactory::setFactory(AUD_IFactory* factory)
+{
+       m_factory = factory;
+}
+
+AUD_IFactory* AUD_EffectFactory::getFactory()
+{
+       return m_factory;
+}
diff --git a/intern/audaspace/FX/AUD_EffectFactory.h b/intern/audaspace/FX/AUD_EffectFactory.h
new file mode 100644 (file)
index 0000000..67259b9
--- /dev/null
@@ -0,0 +1,76 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#ifndef AUD_EFFECTFACTORY
+#define AUD_EFFECTFACTORY
+
+#include "AUD_IFactory.h"
+
+/**
+ * This factory is a base class for all effect factories that take one other
+ * factory as input.
+ */
+class AUD_EffectFactory : public AUD_IFactory
+{
+protected:
+       /**
+        * If there is no reader it is created out of this factory.
+        */
+       AUD_IFactory* m_factory;
+
+       /**
+        * Returns the reader created out of the factory.
+        * This method can be used for the createReader function of the implementing
+        * classes.
+        * \return The reader created out of the factory or NULL if there is none.
+        */
+       AUD_IReader* getReader();
+
+public:
+       /**
+        * Creates a new factory.
+        * \param factory The input factory.
+        */
+       AUD_EffectFactory(AUD_IFactory* factory);
+
+       /**
+        * Destroys the factory.
+        */
+       virtual ~AUD_EffectFactory() {}
+
+       /**
+        * Sets the input factory.
+        * \param factory The input factory.
+        */
+       void setFactory(AUD_IFactory* factory);
+
+       /**
+        * Returns the saved factory.
+        * \return The factory or NULL if there has no factory been saved.
+        */
+       AUD_IFactory* getFactory();
+};
+
+#endif //AUD_EFFECTFACTORY
diff --git a/intern/audaspace/FX/AUD_EffectReader.cpp b/intern/audaspace/FX/AUD_EffectReader.cpp
new file mode 100644 (file)
index 0000000..47026b8
--- /dev/null
@@ -0,0 +1,78 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#include "AUD_EffectReader.h"
+
+AUD_EffectReader::AUD_EffectReader(AUD_IReader* reader)
+{
+       if(!reader)
+               AUD_THROW(AUD_ERROR_READER);
+       m_reader = reader;
+}
+
+AUD_EffectReader::~AUD_EffectReader()
+{
+       delete m_reader; AUD_DELETE("reader")
+}
+
+bool AUD_EffectReader::isSeekable()
+{
+       return m_reader->isSeekable();
+}
+
+void AUD_EffectReader::seek(int position)
+{
+       m_reader->seek(position);
+}
+
+int AUD_EffectReader::getLength()
+{
+       return m_reader->getLength();
+}
+
+int AUD_EffectReader::getPosition()
+{
+       return m_reader->getPosition();
+}
+
+AUD_Specs AUD_EffectReader::getSpecs()
+{
+       return m_reader->getSpecs();
+}
+
+AUD_ReaderType AUD_EffectReader::getType()
+{
+       return m_reader->getType();
+}
+
+bool AUD_EffectReader::notify(AUD_Message &message)
+{
+       return m_reader->notify(message);
+}
+
+void AUD_EffectReader::read(int & length, sample_t* & buffer)
+{
+       m_reader->read(length, buffer);
+}
diff --git a/intern/audaspace/FX/AUD_EffectReader.h b/intern/audaspace/FX/AUD_EffectReader.h
new file mode 100644 (file)
index 0000000..f64bf34
--- /dev/null
@@ -0,0 +1,66 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#ifndef AUD_EFFECTREADER
+#define AUD_EFFECTREADER
+
+#include "AUD_IReader.h"
+
+/**
+ * This reader is a base class for all effect readers that take one other reader
+ * as input.
+ */
+class AUD_EffectReader : public AUD_IReader
+{
+protected:
+       /**
+        * The reader to read from.
+        */
+       AUD_IReader* m_reader;
+
+public:
+       /**
+        * Creates a new effect reader.
+        * \param reader The reader to read from.
+        * \exception AUD_Exception Thrown if the reader specified is NULL.
+        */
+       AUD_EffectReader(AUD_IReader* reader);
+
+       /**
+        * Destroys the reader.
+        */
+       virtual ~AUD_EffectReader();
+
+       virtual bool isSeekable();
+       virtual void seek(int position);
+       virtual int getLength();
+       virtual int getPosition();
+       virtual AUD_Specs getSpecs();
+       virtual AUD_ReaderType getType();
+       virtual bool notify(AUD_Message &message);
+       virtual void read(int & length, sample_t* & buffer);
+};
+
+#endif //AUD_EFFECTREADER
diff --git a/intern/audaspace/FX/AUD_FaderFactory.cpp b/intern/audaspace/FX/AUD_FaderFactory.cpp
new file mode 100644 (file)
index 0000000..4357e11
--- /dev/null
@@ -0,0 +1,84 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#include "AUD_FaderFactory.h"
+#include "AUD_FaderReader.h"
+
+AUD_FaderFactory::AUD_FaderFactory(AUD_IFactory* factory, AUD_FadeType type,
+                                                                  float start, float length) :
+               AUD_EffectFactory(factory),
+               m_type(type),
+               m_start(start),
+               m_length(length) {}
+
+AUD_FaderFactory::AUD_FaderFactory(AUD_FadeType type,
+                                                                  float start, float length) :
+               AUD_EffectFactory(0),
+               m_type(type),
+               m_start(start),
+               m_length(length) {}
+
+AUD_FadeType AUD_FaderFactory::getType()
+{
+       return m_type;
+}
+
+void AUD_FaderFactory::setType(AUD_FadeType type)
+{
+       m_type = type;
+}
+
+float AUD_FaderFactory::getStart()
+{
+       return m_start;
+}
+
+void AUD_FaderFactory::setStart(float start)
+{
+       m_start = start;
+}
+
+float AUD_FaderFactory::getLength()
+{
+       return m_length;
+}
+
+void AUD_FaderFactory::setLength(float length)
+{
+       m_length = length;
+}
+
+AUD_IReader* AUD_FaderFactory::createReader()
+{
+       AUD_IReader* reader = getReader();
+
+       if(reader != 0)
+       {
+               reader = new AUD_FaderReader(reader, m_type, m_start, m_length);
+               AUD_NEW("reader")
+       }
+
+       return reader;
+}
diff --git a/intern/audaspace/FX/AUD_FaderFactory.h b/intern/audaspace/FX/AUD_FaderFactory.h
new file mode 100644 (file)
index 0000000..4999cca
--- /dev/null
@@ -0,0 +1,111 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#ifndef AUD_FADERFACTORY
+#define AUD_FADERFACTORY
+
+#include "AUD_EffectFactory.h"
+
+/**
+ * This factory fades another factory.
+ * If the fading type is AUD_FADE_IN, everything before the fading start will be
+ * silenced, for AUD_FADE_OUT that's true for everything after fading ends.
+ */
+class AUD_FaderFactory : public AUD_EffectFactory
+{
+private:
+       /**
+        * The fading type.
+        */
+       AUD_FadeType m_type;
+
+       /**
+        * The fading start.
+        */
+       float m_start;
+
+       /**
+        * The fading length.
+        */
+       float m_length;
+
+public:
+       /**
+        * Creates a new fader factory.
+        * \param factory The input factory.
+        * \param type The fading type.
+        * \param start The time where fading should start in seconds.
+        * \param length How long fading should last in seconds.
+        */
+       AUD_FaderFactory(AUD_IFactory* factory = 0,
+                                         AUD_FadeType type = AUD_FADE_IN,
+                                         float start = 0.0f, float length = 1.0f);
+
+       /**
+        * Creates a new fader factory.
+        * \param type The fading type.
+        * \param start The time where fading should start in seconds.
+        * \param length How long fading should last in seconds.
+        */
+       AUD_FaderFactory(AUD_FadeType type = AUD_FADE_IN,
+                                         float start = 0.0f, float length = 1.0f);
+
+       /**
+        * Returns the fading type.
+        */
+       AUD_FadeType getType();
+
+       /**
+        * Sets the fading type.
+        * \param type The new fading type: AUD_FADE_IN or AUD_FADE_OUT.
+        */
+       void setType(AUD_FadeType type);
+
+       /**
+        * Returns the fading start.
+        */
+       float getStart();
+
+       /**
+        * Sets the fading start.
+        * \param start The new fading start.
+        */
+       void setStart(float start);
+
+       /**
+        * Returns the fading length.
+        */
+       float getLength();
+
+       /**
+        * Sets the fading length.
+        * \param start The new fading length.
+        */
+       void setLength(float length);
+
+       virtual AUD_IReader* createReader();
+};
+
+#endif //AUD_FADERFACTORY
diff --git a/intern/audaspace/FX/AUD_FaderReader.cpp b/intern/audaspace/FX/AUD_FaderReader.cpp
new file mode 100644 (file)
index 0000000..d5096e7
--- /dev/null
@@ -0,0 +1,133 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#include "AUD_FaderReader.h"
+#include "AUD_Buffer.h"
+
+#include <cstring>
+
+AUD_FaderReader::AUD_FaderReader(AUD_IReader* reader, AUD_FadeType type,
+                                                                float start,float length) :
+               AUD_EffectReader(reader),
+               m_type(type),
+               m_start(start),
+               m_length(length)
+{
+       int bigendian = 1;
+       bigendian = (((char*)&bigendian)[0]) ? 0: 1; // 1 if Big Endian
+
+       switch(m_reader->getSpecs().format)
+       {
+       case AUD_FORMAT_S16:
+               m_adjust = AUD_volume_adjust<int16_t>;
+               break;
+       case AUD_FORMAT_S32:
+               m_adjust = AUD_volume_adjust<int32_t>;
+               break;
+       case AUD_FORMAT_FLOAT32:
+               m_adjust = AUD_volume_adjust<float>;
+               break;
+       case AUD_FORMAT_FLOAT64:
+               m_adjust = AUD_volume_adjust<double>;
+               break;
+       case AUD_FORMAT_U8:
+               m_adjust = AUD_volume_adjust_u8;
+               break;
+       case AUD_FORMAT_S24:
+               m_adjust = bigendian ? AUD_volume_adjust_s24_be :
+                                                          AUD_volume_adjust_s24_le;
+               break;
+       default:
+               delete m_reader;
+               AUD_THROW(AUD_ERROR_READER);
+       }
+
+       m_buffer = new AUD_Buffer(); AUD_NEW("buffer")
+}
+
+AUD_FaderReader::~AUD_FaderReader()
+{
+       delete m_buffer; AUD_DELETE("buffer")
+}
+
+bool AUD_FaderReader::notify(AUD_Message &message)
+{
+       return m_reader->notify(message);
+}
+
+void AUD_FaderReader::read(int & length, sample_t* & buffer)
+{
+       int position = m_reader->getPosition();
+       AUD_Specs specs = m_reader->getSpecs();
+       int samplesize = AUD_SAMPLE_SIZE(specs);
+
+       m_reader->read(length, buffer);
+
+       if(m_buffer->getSize() < length * samplesize)
+               m_buffer->resize(length * samplesize);
+
+       if((position + length) / (float)specs.rate <= m_start)
+       {
+               if(m_type != AUD_FADE_OUT)
+               {
+                       buffer = m_buffer->getBuffer();
+                       memset(buffer,
+                                  specs.format == AUD_FORMAT_U8 ? 0x80 : 0,
+                                  length * samplesize);
+               }
+       }
+       else if(position / (float)specs.rate >= m_start+m_length)
+       {
+               if(m_type == AUD_FADE_OUT)
+               {
+                       buffer = m_buffer->getBuffer();
+                       memset(buffer,
+                                  specs.format == AUD_FORMAT_U8 ? 0x80 : 0,
+                                  length * samplesize);
+               }
+       }
+       else
+       {
+               sample_t* buf = m_buffer->getBuffer();
+               float volume;
+
+               for(int i = 0; i < length; i++)
+               {
+                       volume = (((position+i)/(float)specs.rate)-m_start) / m_length;
+                       if(volume > 1.0f)
+                               volume = 1.0f;
+                       else if(volume < 0.0f)
+                               volume = 0.0f;
+
+                       if(m_type == AUD_FADE_OUT)
+                               volume = 1.0f - volume;
+
+                       m_adjust(buf + i * samplesize, buffer + i * samplesize,
+                                        specs.channels, volume);
+               }
+
+               buffer = buf;
+       }
+}
diff --git a/intern/audaspace/FX/AUD_FaderReader.h b/intern/audaspace/FX/AUD_FaderReader.h
new file mode 100644 (file)
index 0000000..773643b
--- /dev/null
@@ -0,0 +1,86 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#ifndef AUD_FADERREADER
+#define AUD_FADERREADER
+
+#include "AUD_EffectReader.h"
+#include "AUD_ConverterFunctions.h"
+class AUD_Buffer;
+
+/**
+ * This class fades another reader.
+ * If the fading type is AUD_FADE_IN, everything before the fading start will be
+ * silenced, for AUD_FADE_OUT that's true for everything after fading ends.
+ */
+class AUD_FaderReader : public AUD_EffectReader
+{
+private:
+       /**
+        * The playback buffer.
+        */
+       AUD_Buffer *m_buffer;
+
+       /**
+        * The fading type.
+        */
+       AUD_FadeType m_type;
+
+       /**
+        * The fading start.
+        */
+       float m_start;
+
+       /**
+        * The fading length.
+        */
+       float m_length;
+
+       /**
+        * Volume adjustment function.
+        */
+       AUD_volume_adjust_f m_adjust;
+
+public:
+       /**
+        * Creates a new fader reader.
+        * \param type The fading type.
+        * \param start The time where fading should start in seconds.
+        * \param length How long fading should last in seconds.
+        * \exception AUD_Exception Thrown if the reader specified is NULL.
+        */
+       AUD_FaderReader(AUD_IReader* reader, AUD_FadeType type,
+                                       float start,float length);
+
+       /**
+        * Destroys the reader.
+        */
+       virtual ~AUD_FaderReader();
+
+       virtual bool notify(AUD_Message &message);
+       virtual void read(int & length, sample_t* & buffer);
+};
+
+#endif //AUD_FADERREADER
diff --git a/intern/audaspace/FX/AUD_LimiterFactory.cpp b/intern/audaspace/FX/AUD_LimiterFactory.cpp
new file mode 100644 (file)
index 0000000..6f19575
--- /dev/null
@@ -0,0 +1,67 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#include "AUD_LimiterFactory.h"
+#include "AUD_LimiterReader.h"
+#include "AUD_Space.h"
+
+AUD_LimiterFactory::AUD_LimiterFactory(AUD_IFactory* factory,
+                                                                          float start, float end) :
+               AUD_EffectFactory(factory),
+               m_start(start),
+               m_end(end) {}
+
+float AUD_LimiterFactory::getStart()
+{
+       return m_start;
+}
+
+void AUD_LimiterFactory::setStart(float start)
+{
+       m_start = start;
+}
+
+float AUD_LimiterFactory::getEnd()
+{
+       return m_end;
+}
+
+void AUD_LimiterFactory::setEnd(float end)
+{
+       m_end = end;
+}
+
+AUD_IReader* AUD_LimiterFactory::createReader()
+{
+       AUD_IReader* reader = getReader();
+
+       if(reader != 0)
+       {
+               reader = new AUD_LimiterReader(reader, m_start, m_end);
+               AUD_NEW("reader")
+       }
+
+       return reader;
+}
diff --git a/intern/audaspace/FX/AUD_LimiterFactory.h b/intern/audaspace/FX/AUD_LimiterFactory.h
new file mode 100644 (file)
index 0000000..588fea6
--- /dev/null
@@ -0,0 +1,84 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#ifndef AUD_LIMITERFACTORY
+#define AUD_LIMITERFACTORY
+
+#include "AUD_EffectFactory.h"
+
+/**
+ * This factory limits another factory in start and end time.
+ */
+class AUD_LimiterFactory : public AUD_EffectFactory
+{
+private:
+       /**
+        * The start time.
+        */
+       float m_start;
+
+       /**
+        * The end time.
+        */
+       float m_end;
+
+public:
+       /**
+        * Creates a new limiter factory.
+        * \param factory The input factory.
+        * \param start The desired start time.
+        * \param end The desired end time, a negative value signals that it should
+        *            play to the end.
+        */
+       AUD_LimiterFactory(AUD_IFactory* factory = 0,
+                                          float start = 0, float end = -1);
+
+       /**
+        * Returns the start time.
+        */
+       float getStart();
+
+       /**
+        * Sets the start time.
+        * \param start The new start time.
+        */
+       void setStart(float start);
+
+       /**
+        * Returns the end time.
+        */
+       float getEnd();
+
+       /**
+        * Sets the end time.
+        * \param end The new end time, a negative value signals that it should play
+        *            to the end.
+        */
+       void setEnd(float end);
+
+       virtual AUD_IReader* createReader();
+};
+
+#endif //AUD_LIMITERFACTORY
diff --git a/intern/audaspace/FX/AUD_LimiterReader.cpp b/intern/audaspace/FX/AUD_LimiterReader.cpp
new file mode 100644 (file)
index 0000000..0588236
--- /dev/null
@@ -0,0 +1,95 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#include "AUD_LimiterReader.h"
+#include "AUD_Buffer.h"
+
+#include <iostream>
+
+AUD_LimiterReader::AUD_LimiterReader(AUD_IReader* reader,
+                                                                        float start, float end) :
+               AUD_EffectReader(reader)
+{
+       m_end = (int)(end * reader->getSpecs().rate);
+
+       if(start <= 0)
+               m_start = 0;
+       else
+       {
+               m_start = (int)(start * reader->getSpecs().rate);
+               if(m_reader->isSeekable())
+                       m_reader->seek(m_start);
+               else
+               {
+                       // skip first m_start samples by reading them
+                       int length;
+                       sample_t* buffer;
+                       for(int i = m_start;
+                               i >= AUD_DEFAULT_BUFFER_SIZE;
+                               i -= AUD_DEFAULT_BUFFER_SIZE)
+                       {
+                               length = AUD_DEFAULT_BUFFER_SIZE;
+                               m_reader->read(length, buffer);
+                               length = i;
+                       }
+                       m_reader->read(length, buffer);
+               }
+       }
+}
+
+void AUD_LimiterReader::seek(int position)
+{
+       m_reader->seek(position + m_start);
+}
+
+int AUD_LimiterReader::getLength()
+{
+       int len = m_reader->getLength();
+       if(m_reader->getType() != AUD_TYPE_BUFFER || len < 0 ||
+          (len > m_end && m_end >= 0))
+               len = m_end;
+       return len - m_start;
+}
+
+int AUD_LimiterReader::getPosition()
+{
+       return m_reader->getPosition() - m_start;
+}
+
+void AUD_LimiterReader::read(int & length, sample_t* & buffer)
+{
+       if(m_end >= 0)
+       {
+               int position = m_reader->getPosition();
+               if(position+length > m_end)
+                       length = m_end - position;
+               if(length < 0)
+               {
+                       length = 0;
+                       return;
+               }
+       }
+       m_reader->read(length, buffer);
+}
diff --git a/intern/audaspace/FX/AUD_LimiterReader.h b/intern/audaspace/FX/AUD_LimiterReader.h
new file mode 100644 (file)
index 0000000..9921f5e
--- /dev/null
@@ -0,0 +1,64 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#ifndef AUD_LIMITERREADER
+#define AUD_LIMITERREADER
+
+#include "AUD_EffectReader.h"
+
+/**
+ * This reader limits another reader in start and end sample.
+ */
+class AUD_LimiterReader : public AUD_EffectReader
+{
+private:
+       /**
+        * The start sample: inclusive.
+        */
+       int m_start;
+
+       /**
+        * The end sample: exlusive.
+        */
+       int m_end;
+
+public:
+       /**
+        * Creates a new limiter reader.
+        * \param reader The reader to read from.
+        * \param start The desired start sample (inclusive).
+        * \param end The desired end sample (exklusive), a negative value signals
+        *            that it should play to the end.
+        * \exception AUD_Exception Thrown if the reader specified is NULL.
+        */
+       AUD_LimiterReader(AUD_IReader* reader, float start = 0, float end = -1);
+
+       virtual void seek(int position);
+       virtual int getLength();
+       virtual int getPosition();
+       virtual void read(int & length, sample_t* & buffer);
+};
+
+#endif //AUD_LIMITERREADER
diff --git a/intern/audaspace/FX/AUD_LoopFactory.cpp b/intern/audaspace/FX/AUD_LoopFactory.cpp
new file mode 100644 (file)
index 0000000..90186f6
--- /dev/null
@@ -0,0 +1,57 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#include "AUD_LoopFactory.h"
+#include "AUD_LoopReader.h"
+
+AUD_LoopFactory::AUD_LoopFactory(AUD_IFactory* factory, int loop) :
+               AUD_EffectFactory(factory),
+               m_loop(loop) {}
+
+AUD_LoopFactory::AUD_LoopFactory(int loop) :
+               AUD_EffectFactory(0),
+               m_loop(loop) {}
+
+int AUD_LoopFactory::getLoop()
+{
+       return m_loop;
+}
+
+void AUD_LoopFactory::setLoop(int loop)
+{
+       m_loop = loop;
+}
+
+AUD_IReader* AUD_LoopFactory::createReader()
+{
+       AUD_IReader* reader = getReader();
+
+       if(reader != 0)
+       {
+               reader = new AUD_LoopReader(reader, m_loop); AUD_NEW("reader")
+       }
+
+       return reader;
+}
diff --git a/intern/audaspace/FX/AUD_LoopFactory.h b/intern/audaspace/FX/AUD_LoopFactory.h
new file mode 100644 (file)
index 0000000..461d8c9
--- /dev/null
@@ -0,0 +1,74 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#ifndef AUD_LOOPFACTORY
+#define AUD_LOOPFACTORY
+
+#include "AUD_EffectFactory.h"
+
+/**
+ * This factory loops another factory.
+ * \note The reader has to be seekable.
+ */
+class AUD_LoopFactory : public AUD_EffectFactory
+{
+private:
+       /**
+        * The loop count.
+        */
+       float m_loop;
+
+public:
+       /**
+        * Creates a new loop factory.
+        * \param factory The input factory.
+        * \param loop The desired loop count, negative values result in endless
+        *        looping.
+        */
+       AUD_LoopFactory(AUD_IFactory* factory = 0, int loop = -1);
+
+       /**
+        * Creates a new loop factory.
+        * \param loop The desired loop count, negative values result in endless
+        *        looping.
+        */
+       AUD_LoopFactory(int loop);
+
+       /**
+        * Returns the loop count.
+        */
+       int getLoop();
+
+       /**
+        * Sets the loop count.
+        * \param loop The desired loop count, negative values result in endless
+        *        looping.
+        */
+       void setLoop(int loop);
+
+       virtual AUD_IReader* createReader();
+};
+
+#endif //AUD_LOOPFACTORY
diff --git a/intern/audaspace/FX/AUD_LoopReader.cpp b/intern/audaspace/FX/AUD_LoopReader.cpp
new file mode 100644 (file)
index 0000000..9e27032
--- /dev/null
@@ -0,0 +1,107 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#include "AUD_LoopReader.h"
+#include "AUD_Buffer.h"
+
+#include <cstring>
+#include <stdio.h>
+
+AUD_LoopReader::AUD_LoopReader(AUD_IReader* reader, int loop) :
+               AUD_EffectReader(reader), m_loop(loop)
+{
+       m_buffer = new AUD_Buffer(); AUD_NEW("buffer")
+}
+
+AUD_LoopReader::~AUD_LoopReader()
+{
+       delete m_buffer; AUD_DELETE("buffer")
+}
+
+AUD_ReaderType AUD_LoopReader::getType()
+{
+       if(m_loop < 0)
+               return AUD_TYPE_STREAM;
+       return m_reader->getType();
+}
+
+bool AUD_LoopReader::notify(AUD_Message &message)
+{
+       if(message.type == AUD_MSG_LOOP)
+       {
+               m_loop = message.loopcount;
+
+               m_reader->notify(message);
+
+               return true;
+       }
+       return m_reader->notify(message);
+}
+
+void AUD_LoopReader::read(int & length, sample_t* & buffer)
+{
+       int samplesize = AUD_SAMPLE_SIZE(m_reader->getSpecs());
+
+       int len = length;
+
+       m_reader->read(len, buffer);
+
+       if(len < length && m_loop != 0)
+       {
+               int pos = 0;
+
+               if(m_buffer->getSize() < length*samplesize)
+                       m_buffer->resize(length*samplesize);
+
+               memcpy(m_buffer->getBuffer() + pos * samplesize,
+                          buffer, len * samplesize);
+
+               pos += len;
+
+               while(pos < length && m_loop != 0)
+               {
+                       if(m_loop > 0)
+                               m_loop--;
+
+                       m_reader->seek(0);
+
+                       len = length - pos;
+                       m_reader->read(len, buffer);
+                       // prevent endless loop
+                       if(!len)
+                               break;
+
+                       memcpy(m_buffer->getBuffer() + pos * samplesize,
+                                  buffer, len * samplesize);
+
+                       pos += len;
+               }
+
+               length = pos;
+               buffer = m_buffer->getBuffer();
+       }
+       else
+               length = len;
+}
diff --git a/intern/audaspace/FX/AUD_LoopReader.h b/intern/audaspace/FX/AUD_LoopReader.h
new file mode 100644 (file)
index 0000000..621ee34
--- /dev/null
@@ -0,0 +1,69 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#ifndef AUD_LOOPREADER
+#define AUD_LOOPREADER
+
+#include "AUD_EffectReader.h"
+class AUD_Buffer;
+
+/**
+ * This class reads another reader and loops it.
+ * \note The other reader must be seekable.
+ */
+class AUD_LoopReader : public AUD_EffectReader
+{
+private:
+       /**
+        * The playback buffer.
+        */
+       AUD_Buffer *m_buffer;
+
+       /**
+        * The left loop count.
+        */
+       int m_loop;
+
+public:
+       /**
+        * Creates a new loop reader.
+        * \param reader The reader to read from.
+        * \param loop The desired loop count, negative values result in endless
+        *        looping.
+        * \exception AUD_Exception Thrown if the reader specified is NULL.
+        */
+       AUD_LoopReader(AUD_IReader* reader, int loop);
+
+       /**
+        * Destroys the reader.
+        */
+       virtual ~AUD_LoopReader();
+
+       virtual AUD_ReaderType getType();
+       virtual bool notify(AUD_Message &message);
+       virtual void read(int & length, sample_t* & buffer);
+};
+
+#endif //AUD_LOOPREADER
diff --git a/intern/audaspace/FX/AUD_PingPongFactory.cpp b/intern/audaspace/FX/AUD_PingPongFactory.cpp
new file mode 100644 (file)
index 0000000..a030d58
--- /dev/null
@@ -0,0 +1,67 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#include "AUD_PingPongFactory.h"
+#include "AUD_DoubleReader.h"
+#include "AUD_ReverseFactory.h"
+
+AUD_PingPongFactory::AUD_PingPongFactory(AUD_IFactory* factory) :
+               AUD_EffectFactory(factory) {}
+
+AUD_IReader* AUD_PingPongFactory::createReader()
+{
+       if(m_factory == 0)
+               return 0;
+
+       AUD_IReader* reader = m_factory->createReader();
+
+       if(reader != 0)
+       {
+               AUD_IReader* reader2;
+               AUD_ReverseFactory factory(m_factory);
+
+               try
+               {
+                       reader2 = factory.createReader();
+               }
+               catch(AUD_Exception e)
+               {
+                       reader2 = 0;
+               }
+
+               if(reader2 != 0)
+               {
+                       reader = new AUD_DoubleReader(reader, reader2);
+                       AUD_NEW("reader")
+               }
+               else
+               {
+                       delete reader; AUD_DELETE("reader")
+                       reader = 0;
+               }
+       }
+
+       return reader;
+}
diff --git a/intern/audaspace/FX/AUD_PingPongFactory.h b/intern/audaspace/FX/AUD_PingPongFactory.h
new file mode 100644 (file)
index 0000000..b8854da
--- /dev/null
@@ -0,0 +1,51 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#ifndef AUD_PINGPONGFACTORY
+#define AUD_PINGPONGFACTORY
+
+#include "AUD_EffectFactory.h"
+
+/**
+ * This factory plays another factory first normal, then reversed.
+ * \note Readers from the underlying factory must be from the buffer type.
+ */
+class AUD_PingPongFactory : public AUD_EffectFactory
+{
+public:
+       /**
+        * Creates a new ping pong factory.
+        * \param factory The input factory.
+        */
+       AUD_PingPongFactory(AUD_IFactory* factory = 0);
+
+       /**
+        * Destroys the factory.
+        */
+
+       virtual AUD_IReader* createReader();
+};
+
+#endif //AUD_PINGPONGFACTORY
diff --git a/intern/audaspace/FX/AUD_PitchFactory.cpp b/intern/audaspace/FX/AUD_PitchFactory.cpp
new file mode 100644 (file)
index 0000000..5f81428
--- /dev/null
@@ -0,0 +1,48 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#include "AUD_PitchFactory.h"
+#include "AUD_PitchReader.h"
+#include "AUD_Space.h"
+
+AUD_PitchFactory::AUD_PitchFactory(AUD_IFactory* factory, float pitch) :
+               AUD_EffectFactory(factory),
+               m_pitch(pitch) {}
+
+AUD_PitchFactory::AUD_PitchFactory(float pitch) :
+               AUD_EffectFactory(0),
+               m_pitch(pitch) {}
+
+AUD_IReader* AUD_PitchFactory::createReader()
+{
+       AUD_IReader* reader = getReader();
+
+       if(reader != 0)
+       {
+               reader = new AUD_PitchReader(reader, m_pitch); AUD_NEW("reader")
+       }
+
+       return reader;
+}
diff --git a/intern/audaspace/FX/AUD_PitchFactory.h b/intern/audaspace/FX/AUD_PitchFactory.h
new file mode 100644 (file)
index 0000000..3209aa4
--- /dev/null
@@ -0,0 +1,70 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#ifndef AUD_PITCHFACTORY
+#define AUD_PITCHFACTORY
+
+#include "AUD_EffectFactory.h"
+
+/**
+ * This factory changes the pitch of another factory.
+ */
+class AUD_PitchFactory : public AUD_EffectFactory
+{
+private:
+       /**
+        * The pitch.
+        */
+       float m_pitch;
+
+public:
+       /**
+        * Creates a new pitch factory.
+        * \param factory The input factory.
+        * \param pitch The desired pitch.
+        */
+       AUD_PitchFactory(AUD_IFactory* factory = 0, float pitch = 1.0);
+
+       /**
+        * Creates a new pitch factory.
+        * \param pitch The desired pitch.
+        */
+       AUD_PitchFactory(float pitch);
+
+       /**
+        * Returns the pitch.
+        */
+       float getPitch();
+
+       /**
+        * Sets the pitch.
+        * \param pitch The new pitch value. Should be between 0.0 and 1.0.
+        */
+       void setPitch(float pitch);
+
+       virtual AUD_IReader* createReader();
+};
+
+#endif //AUD_PITCHFACTORY
diff --git a/intern/audaspace/FX/AUD_PitchReader.cpp b/intern/audaspace/FX/AUD_PitchReader.cpp
new file mode 100644 (file)
index 0000000..c53264e
--- /dev/null
@@ -0,0 +1,39 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#include "AUD_PitchReader.h"
+
+AUD_PitchReader::AUD_PitchReader(AUD_IReader* reader, float pitch) :
+               AUD_EffectReader(reader)
+{
+       m_pitch = pitch;
+}
+
+AUD_Specs AUD_PitchReader::getSpecs()
+{
+       AUD_Specs specs = m_reader->getSpecs();
+       specs.rate = (AUD_SampleRate)((int)(specs.rate * m_pitch));
+       return specs;
+}
diff --git a/intern/audaspace/FX/AUD_PitchReader.h b/intern/audaspace/FX/AUD_PitchReader.h
new file mode 100644 (file)
index 0000000..440e9cc
--- /dev/null
@@ -0,0 +1,54 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#ifndef AUD_PITCHREADER
+#define AUD_PITCHREADER
+
+#include "AUD_EffectReader.h"
+
+/**
+ * This class reads another reader and changes it's pitch.
+ */
+class AUD_PitchReader : public AUD_EffectReader
+{
+private:
+       /**
+        * The pitch level.
+        */
+       float m_pitch;
+
+public:
+       /**
+        * Creates a new pitch reader.
+        * \param reader The reader to read from.
+        * \param pitch The size of the buffer.
+        * \exception AUD_Exception Thrown if the reader specified is NULL.
+        */
+       AUD_PitchReader(AUD_IReader* reader, float pitch);
+
+       virtual AUD_Specs getSpecs();
+};
+
+#endif //AUD_PITCHREADER
diff --git a/intern/audaspace/FX/AUD_ReverseFactory.cpp b/intern/audaspace/FX/AUD_ReverseFactory.cpp
new file mode 100644 (file)
index 0000000..1242641
--- /dev/null
@@ -0,0 +1,43 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#include "AUD_ReverseFactory.h"
+#include "AUD_ReverseReader.h"
+#include "AUD_Space.h"
+
+AUD_ReverseFactory::AUD_ReverseFactory(AUD_IFactory* factory) :
+               AUD_EffectFactory(factory) {}
+
+AUD_IReader* AUD_ReverseFactory::createReader()
+{
+       AUD_IReader* reader = getReader();
+
+       if(reader != 0)
+       {
+               reader = new AUD_ReverseReader(reader); AUD_NEW("reader")
+       }
+
+       return reader;
+}
diff --git a/intern/audaspace/FX/AUD_ReverseFactory.h b/intern/audaspace/FX/AUD_ReverseFactory.h
new file mode 100644 (file)
index 0000000..4b664c4
--- /dev/null
@@ -0,0 +1,50 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#ifndef AUD_REVERSEFACTORY
+#define AUD_REVERSEFACTORY
+
+#include "AUD_EffectFactory.h"
+
+/**
+ * This factory reads another factory reverted.
+ * \note Readers from the underlying factory must be from the buffer type.
+ */
+class AUD_ReverseFactory : public AUD_EffectFactory
+{
+public:
+       /**
+        * Creates a new reverse factory.
+        * \param factory The input factory.
+        */
+       AUD_ReverseFactory(AUD_IFactory* factory = 0);
+
+       /**
+        * Destroys the factory.
+        */
+       virtual AUD_IReader* createReader();
+};
+
+#endif //AUD_REVERSEFACTORY
diff --git a/intern/audaspace/FX/AUD_ReverseReader.cpp b/intern/audaspace/FX/AUD_ReverseReader.cpp
new file mode 100644 (file)
index 0000000..043480b
--- /dev/null
@@ -0,0 +1,111 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#include "AUD_ReverseReader.h"
+#include "AUD_Buffer.h"
+
+#include <cstring>
+
+AUD_ReverseReader::AUD_ReverseReader(AUD_IReader* reader) :
+               AUD_EffectReader(reader)
+{
+       if(reader->getType() != AUD_TYPE_BUFFER)
+               AUD_THROW(AUD_ERROR_READER);
+
+       m_length = reader->getLength();
+       if(m_length < 0)
+               AUD_THROW(AUD_ERROR_READER);
+
+       m_position = 0;
+       m_buffer = new AUD_Buffer(); AUD_NEW("buffer")
+}
+
+AUD_ReverseReader::~AUD_ReverseReader()
+{
+       delete m_buffer; AUD_DELETE("buffer")
+}
+
+void AUD_ReverseReader::seek(int position)
+{
+       m_position = position;
+}
+
+int AUD_ReverseReader::getLength()
+{
+       return m_length;
+}
+
+int AUD_ReverseReader::getPosition()
+{
+       return m_position;
+}
+
+void AUD_ReverseReader::read(int & length, sample_t* & buffer)
+{
+       // first correct the length
+       if(m_position+length > m_length)
+               length = m_length-m_position;
+
+       if(length <= 0)
+       {
+               length = 0;
+               return;
+       }
+
+       int samplesize = AUD_SAMPLE_SIZE(getSpecs());
+
+       // resize buffer if needed
+       if(m_buffer->getSize() < length * samplesize)
+               m_buffer->resize(length * samplesize);
+
+       buffer = m_buffer->getBuffer();
+
+       sample_t* buf;
+       int len = length;
+
+       // read from reader
+       m_reader->seek(m_length-m_position-len);
+       m_reader->read(len, buf);
+
+       // set null if reader didn't give enough data
+       if(len < length)
+       {
+               if(getSpecs().format == AUD_FORMAT_U8)
+                       memset(buffer, 0x80, (length-len)*samplesize);
+               else
+                       memset(buffer, 0, (length-len)*samplesize);
+               buffer += length-len;
+       }
+
+       // copy the samples reverted
+       for(int i = 0; i < len; i++)
+               memcpy(buffer + i * samplesize,
+                          buf + (len - 1 - i) * samplesize,
+                          samplesize);
+
+       m_position += length;
+
+       buffer = m_buffer->getBuffer();
+}
diff --git a/intern/audaspace/FX/AUD_ReverseReader.h b/intern/audaspace/FX/AUD_ReverseReader.h
new file mode 100644 (file)
index 0000000..045d2ac
--- /dev/null
@@ -0,0 +1,74 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#ifndef AUD_REVERSEREADER
+#define AUD_REVERSEREADER
+
+#include "AUD_EffectReader.h"
+class AUD_Buffer;
+
+/**
+ * This class reads another reader from back to front.
+ * \note The underlying reader must be a buffer.
+ */
+class AUD_ReverseReader : public AUD_EffectReader
+{
+private:
+       /**
+        * The current position.
+        */
+       int m_position;
+
+       /**
+        * The sample count.
+        */
+       int m_length;
+
+       /**
+        * The playback buffer.
+        */
+       AUD_Buffer* m_buffer;
+
+public:
+       /**
+        * Creates a new reverse reader.
+        * \param reader The reader to read from.
+        * \exception AUD_Exception Thrown if the reader specified is NULL or not
+        *            a buffer.
+        */
+       AUD_ReverseReader(AUD_IReader* reader);
+
+       /**
+        * Destroys the reader.
+        */
+       virtual ~AUD_ReverseReader();
+
+       virtual void seek(int position);
+       virtual int getLength();
+       virtual int getPosition();
+       virtual void read(int & length, sample_t* & buffer);
+};
+
+#endif //AUD_REVERSEREADER
diff --git a/intern/audaspace/FX/AUD_VolumeFactory.cpp b/intern/audaspace/FX/AUD_VolumeFactory.cpp
new file mode 100644 (file)
index 0000000..fbde608
--- /dev/null
@@ -0,0 +1,57 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#include "AUD_VolumeFactory.h"
+#include "AUD_VolumeReader.h"
+
+AUD_VolumeFactory::AUD_VolumeFactory(AUD_IFactory* factory, float volume) :
+               AUD_EffectFactory(factory),
+               m_volume(volume) {}
+
+AUD_VolumeFactory::AUD_VolumeFactory(float volume) :
+               AUD_EffectFactory(0),
+               m_volume(volume) {}
+
+float AUD_VolumeFactory::getVolume()
+{
+       return m_volume;
+}
+
+void AUD_VolumeFactory::setVolume(float volume)
+{
+       m_volume = volume;
+}
+
+AUD_IReader* AUD_VolumeFactory::createReader()
+{
+       AUD_IReader* reader = getReader();
+
+       if(reader != 0)
+       {
+               reader = new AUD_VolumeReader(reader, m_volume); AUD_NEW("reader")
+       }
+
+       return reader;
+}
diff --git a/intern/audaspace/FX/AUD_VolumeFactory.h b/intern/audaspace/FX/AUD_VolumeFactory.h
new file mode 100644 (file)
index 0000000..d281253
--- /dev/null
@@ -0,0 +1,72 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#ifndef AUD_VOLUMEFACTORY
+#define AUD_VOLUMEFACTORY
+
+#include "AUD_EffectFactory.h"
+
+/**
+ * This factory changes the volume of another factory.
+ * The set volume should be a value between 0.0 and 1.0, higher values at your
+ * own risk!
+ */
+class AUD_VolumeFactory : public AUD_EffectFactory
+{
+private:
+       /**
+        * The volume.
+        */
+       float m_volume;
+
+public:
+       /**
+        * Creates a new volume factory.
+        * \param factory The input factory.
+        * \param volume The desired volume.
+        */
+       AUD_VolumeFactory(AUD_IFactory* factory = 0, float volume = 1.0);
+
+       /**
+        * Creates a new volume factory.
+        * \param volume The desired volume.
+        */
+       AUD_VolumeFactory(float volume);
+
+       /**
+        * Returns the volume.
+        */
+       float getVolume();
+
+       /**
+        * Sets the volume.
+        * \param volume The new volume value. Should be between 0.0 and 1.0.
+        */
+       void setVolume(float volume);
+
+       virtual AUD_IReader* createReader();
+};
+
+#endif //AUD_VOLUMEFACTORY
diff --git a/intern/audaspace/FX/AUD_VolumeReader.cpp b/intern/audaspace/FX/AUD_VolumeReader.cpp
new file mode 100644 (file)
index 0000000..fc3f201
--- /dev/null
@@ -0,0 +1,97 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#include "AUD_VolumeReader.h"
+#include "AUD_Buffer.h"
+
+#include <cstring>
+
+AUD_VolumeReader::AUD_VolumeReader(AUD_IReader* reader, float volume) :
+               AUD_EffectReader(reader),
+               m_volume(volume)
+{
+       int bigendian = 1;
+       bigendian = (((char*)&bigendian)[0]) ? 0: 1; // 1 if Big Endian
+
+       switch(m_reader->getSpecs().format)
+       {
+       case AUD_FORMAT_S16:
+               m_adjust = AUD_volume_adjust<int16_t>;
+               break;
+       case AUD_FORMAT_S32:
+               m_adjust = AUD_volume_adjust<int32_t>;
+               break;
+       case AUD_FORMAT_FLOAT32:
+               m_adjust = AUD_volume_adjust<float>;
+               break;
+       case AUD_FORMAT_FLOAT64:
+               m_adjust = AUD_volume_adjust<double>;
+               break;
+       case AUD_FORMAT_U8:
+               m_adjust = AUD_volume_adjust_u8;
+               break;
+       case AUD_FORMAT_S24:
+               m_adjust = bigendian ? AUD_volume_adjust_s24_be :
+                                                          AUD_volume_adjust_s24_le;
+               break;
+       default:
+               delete m_reader;
+               AUD_THROW(AUD_ERROR_READER);
+       }
+
+       m_buffer = new AUD_Buffer(); AUD_NEW("buffer")
+}
+
+AUD_VolumeReader::~AUD_VolumeReader()
+{
+       delete m_buffer; AUD_DELETE("buffer")
+}
+
+bool AUD_VolumeReader::notify(AUD_Message &message)
+{
+       if(message.type == AUD_MSG_VOLUME)
+       {
+               m_volume = message.volume;
+
+               m_reader->notify(message);
+
+               return true;
+       }
+       return m_reader->notify(message);
+}
+
+void AUD_VolumeReader::read(int & length, sample_t* & buffer)
+{
+       sample_t* buf;
+       AUD_Specs specs = m_reader->getSpecs();
+
+       m_reader->read(length, buf);
+       if(m_buffer->getSize() < length*AUD_SAMPLE_SIZE(specs))
+               m_buffer->resize(length*AUD_SAMPLE_SIZE(specs));
+
+       buffer = m_buffer->getBuffer();
+
+       m_adjust(buffer, buf, length * specs.channels, m_volume);
+}
diff --git a/intern/audaspace/FX/AUD_VolumeReader.h b/intern/audaspace/FX/AUD_VolumeReader.h
new file mode 100644 (file)
index 0000000..f38ae4d
--- /dev/null
@@ -0,0 +1,72 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#ifndef AUD_VOLUMEREADER
+#define AUD_VOLUMEREADER
+
+#include "AUD_EffectReader.h"
+#include "AUD_ConverterFunctions.h"
+class AUD_Buffer;
+
+/**
+ * This class reads another reader and changes it's volume.
+ */
+class AUD_VolumeReader : public AUD_EffectReader
+{
+private:
+       /**
+        * The playback buffer.
+        */
+       AUD_Buffer *m_buffer;
+
+       /**
+        * The volume level.
+        */
+       float m_volume;
+
+       /**
+        * Volume adjustment function.
+        */
+       AUD_volume_adjust_f m_adjust;
+
+public:
+       /**
+        * Creates a new volume reader.
+        * \param reader The reader to read from.
+        * \param volume The size of the buffer.
+        * \exception AUD_Exception Thrown if the reader specified is NULL.
+        */
+       AUD_VolumeReader(AUD_IReader* reader, float volume);
+
+       /**
+        * Destroys the reader.
+        */
+       virtual ~AUD_VolumeReader();
+
+       virtual bool notify(AUD_Message &message);
+       virtual void read(int & length, sample_t* & buffer);
+};
+
+#endif //AUD_VOLUMEREADER
diff --git a/intern/audaspace/Makefile b/intern/audaspace/Makefile
new file mode 100644 (file)
index 0000000..76a0591
--- /dev/null
@@ -0,0 +1,57 @@
+# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*-
+# vim: tabstop=8
+#
+# $Id: Makefile 19820 2009-04-20 15:06:46Z blendix $
+#
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): GSR
+#
+# ***** END GPL LICENSE BLOCK *****
+#
+#
+
+include nan_definitions.mk
+
+LIBNAME = audaspace
+SOURCEDIR = intern/audaspace
+DIR = $(OCGDIR)/$(SOURCEDIR)
+DIRS = intern
+DIRS += SDL
+
+ifeq ($(WITH_FFMPEG),true)
+  DIRS += ffmpeg
+endif
+
+include nan_subdirs.mk
+
+install: $(ALL_OR_DEBUG)
+       @[ -d $(NAN_AUDASPACE) ] || mkdir $(NAN_AUDASPACE)
+       @[ -d $(NAN_AUDASPACE)/include ] || mkdir $(NAN_AUDASPACE)/include
+       @[ -d $(NAN_AUDASPACE)/lib/$(DEBUG_DIR) ] || mkdir $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)
+       @../tools/cpifdiff.sh $(DIR)/$(DEBUG_DIR)libaudaspace.a $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)
+ifeq ($(OS),darwin)
+       ranlib $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaudaspace.a
+endif
+       @../tools/cpifdiff.sh *.h $(NAN_AUDASPACE)/include/
+
+
diff --git a/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp b/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
new file mode 100644 (file)
index 0000000..f94b11a
--- /dev/null
@@ -0,0 +1,1362 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#include "AUD_OpenALDevice.h"
+#include "AUD_IReader.h"
+#include "AUD_IMixer.h"
+#include "AUD_ConverterFactory.h"
+#include "AUD_SourceCaps.h"
+
+#include <cstring>
+#include <limits>
+
+#ifdef WIN32
+#include <windows.h>
+#else
+#include <unistd.h>
+#endif
+
+#define AUD_OPENAL_CYCLE_BUFFERS 3
+
+/// Saves the data for playback.
+struct AUD_OpenALHandle : AUD_Handle
+{
+       /// Whether it's a buffered or a streamed source.
+       bool isBuffered;
+
+       /// The reader source.
+       AUD_IReader* reader;
+
+       /// Whether to keep the source if end of it is reached.
+       bool keep;
+
+       /// OpenAL sample format.
+       ALenum format;
+
+       /// OpenAL source.
+       ALuint source;
+
+       /// OpenAL buffers.
+       ALuint buffers[AUD_OPENAL_CYCLE_BUFFERS];
+
+       /// The first buffer to be read next.
+       int current;
+
+       /// Whether the stream doesn't return any more data.
+       bool data_end;
+};
+
+struct AUD_OpenALBufferedFactory
+{
+       /// The factory.
+       AUD_IFactory* factory;
+
+       /// The OpenAL buffer.
+       ALuint buffer;
+};
+
+typedef std::list<AUD_OpenALHandle*>::iterator AUD_HandleIterator;
+typedef std::list<AUD_OpenALBufferedFactory*>::iterator AUD_BFIterator;
+
+/******************************************************************************/
+/**************************** Threading Code **********************************/
+/******************************************************************************/
+
+void* AUD_openalRunThread(void* device)
+{
+       AUD_OpenALDevice* dev = (AUD_OpenALDevice*)device;
+       dev->updateStreams();
+       return NULL;
+}
+
+void AUD_OpenALDevice::start()
+{
+       lock();
+
+       if(!m_playing)
+       {
+               pthread_attr_t attr;
+               pthread_attr_init(&attr);
+               pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
+
+               pthread_create(&m_thread, &attr, AUD_openalRunThread, this);
+
+               pthread_attr_destroy(&attr);
+
+               m_playing = true;
+       }
+
+       unlock();
+}
+
+void AUD_OpenALDevice::updateStreams()
+{
+       AUD_OpenALHandle* sound;
+
+       int length;
+       sample_t* buffer;
+
+       ALint info;
+       AUD_Specs specs;
+
+       while(1)
+       {
+               lock();
+
+               alcSuspendContext(m_context);
+
+               // for all sounds
+               AUD_HandleIterator it = m_playingSounds->begin();
+               while(it != m_playingSounds->end())
+               {
+                       sound = *it;
+                       // increment the iterator to make sure it's valid,
+                       // in case the sound gets deleted after stopping
+                       ++it;
+
+                       // is it a streamed sound?
+                       if(!sound->isBuffered)
+                       {
+                               // check for buffer refilling
+                               alGetSourcei(sound->source, AL_BUFFERS_PROCESSED, &info);
+
+                               if(info)
+                               {
+                                       specs = sound->reader->getSpecs();
+
+                                       // for all empty buffers
+                                       while(info--)
+                                       {
+                                               // if there's still data to play back
+                                               if(!sound->data_end)
+                                               {
+                                                       // read data
+                                                       length = m_buffersize;
+                                                       sound->reader->read(length, buffer);
+
+                                                       // read nothing?
+                                                       if(length == 0)
+                                                       {
+                                                               sound->data_end = true;
+                                                               break;
+                                                       }
+
+                                                       // unqueue buffer
+                                                       alSourceUnqueueBuffers(sound->source, 1,
+                                                                                       &sound->buffers[sound->current]);
+                                                       ALenum err;
+                                                       if((err = alGetError()) != AL_NO_ERROR)
+                                                       {
+                                                               sound->data_end = true;
+                                                               break;
+                                                       }
+
+                                                       // fill with new data
+                                                       alBufferData(sound->buffers[sound->current],
+                                                                                sound->format,
+                                                                                buffer,
+                                                                                length * AUD_SAMPLE_SIZE(specs),
+                                                                                specs.rate);
+
+                                                       if(alGetError() != AL_NO_ERROR)
+                                                       {
+                                                               sound->data_end = true;
+                                                               break;
+                                                       }
+
+                                                       // and queue again
+                                                       alSourceQueueBuffers(sound->source, 1,
+                                                                                       &sound->buffers[sound->current]);
+                                                       if(alGetError() != AL_NO_ERROR)
+                                                       {
+                                                               sound->data_end = true;
+                                                               break;
+                                                       }
+
+                                                       sound->current = (sound->current+1) %
+                                                                                        AUD_OPENAL_CYCLE_BUFFERS;
+                                               }
+                                               else
+                                                       break;
+                                       }
+                               }
+                       }
+
+                       // check if the sound has been stopped
+                       alGetSourcei(sound->source, AL_SOURCE_STATE, &info);
+
+                       if(info != AL_PLAYING)
+                       {
+                               // if it really stopped
+                               if(sound->data_end)
+                               {
+                                       // pause or
+                                       if(sound->keep)
+                                               pause(sound);
+                                       // stop
+                                       else
+                                               stop(sound);
+                               }
+                               // continue playing
+                               else
+                                       alSourcePlay(sound->source);
+                       }
+               }
+
+               alcProcessContext(m_context);
+
+               // stop thread
+               if(m_playingSounds->empty())
+               {
+                       unlock();
+                       m_playing = false;
+                       pthread_exit(NULL);
+               }
+
+               unlock();
+
+#ifdef WIN32
+               Sleep(20);
+#else
+               usleep(20000);
+#endif
+       }
+}
+
+/******************************************************************************/
+/**************************** IDevice Code ************************************/
+/******************************************************************************/
+
+bool AUD_OpenALDevice::isValid(AUD_Handle* handle)
+{
+       for(AUD_HandleIterator i = m_playingSounds->begin();
+               i != m_playingSounds->end(); i++)
+               if(*i == handle)
+                       return true;
+       for(AUD_HandleIterator i = m_pausedSounds->begin();
+               i != m_pausedSounds->end(); i++)
+               if(*i == handle)
+                       return true;
+       return false;
+}
+
+AUD_OpenALDevice::AUD_OpenALDevice(AUD_Specs specs, int buffersize)
+{
+       // cannot determine how many channels or which format OpenAL uses, but
+       // it at least is able to play 16 bit stereo audio
+       specs.channels = AUD_CHANNELS_STEREO;
+       specs.format = AUD_FORMAT_S16;
+
+       m_device = alcOpenDevice(NULL);
+
+       if(!m_device)
+               AUD_THROW(AUD_ERROR_OPENAL);
+
+       // at least try to set the frequency
+       ALCint attribs[] = { ALC_FREQUENCY, specs.rate, 0 };
+       ALCint* attributes = attribs;
+       if(specs.rate == AUD_RATE_INVALID)
+               attributes = NULL;
+
+       m_context = alcCreateContext(m_device, attributes);
+       alcMakeContextCurrent(m_context);
+
+       alcGetIntegerv(m_device, ALC_FREQUENCY, 1, (ALCint*)&specs.rate);
+
+       // check for specific formats and channel counts to be played back
+       if(alIsExtensionPresent("AL_EXT_FLOAT32") == AL_TRUE)
+               specs.format = AUD_FORMAT_FLOAT32;
+
+       m_useMC = alIsExtensionPresent("AL_EXT_MCFORMATS") == AL_TRUE;
+
+       alGetError();
+
+       m_converter = new AUD_ConverterFactory(specs); AUD_NEW("factory")
+
+       m_specs = specs;
+       m_buffersize = buffersize;
+       m_playing = false;
+
+       m_playingSounds = new std::list<AUD_OpenALHandle*>(); AUD_NEW("list")
+       m_pausedSounds = new std::list<AUD_OpenALHandle*>(); AUD_NEW("list")
+       m_bufferedFactories = new std::list<AUD_OpenALBufferedFactory*>();
+       AUD_NEW("list")
+
+       pthread_mutexattr_t attr;
+       pthread_mutexattr_init(&attr);
+       pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+
+       pthread_mutex_init(&m_mutex, &attr);
+
+       pthread_mutexattr_destroy(&attr);
+}
+
+AUD_OpenALDevice::~AUD_OpenALDevice()
+{
+       AUD_OpenALHandle* sound;
+
+       lock();
+       alcSuspendContext(m_context);
+
+       // delete all playing sounds
+       while(!m_playingSounds->empty())
+       {
+               sound = *(m_playingSounds->begin());
+               alDeleteSources(1, &sound->source);
+               if(!sound->isBuffered)
+               {
+                       delete sound->reader; AUD_DELETE("reader")
+                       alDeleteBuffers(AUD_OPENAL_CYCLE_BUFFERS, sound->buffers);
+               }
+               delete sound; AUD_DELETE("handle")
+               m_playingSounds->erase(m_playingSounds->begin());
+       }
+
+       // delete all paused sounds
+       while(!m_pausedSounds->empty())
+       {
+               sound = *(m_pausedSounds->begin());
+               alDeleteSources(1, &sound->source);
+               if(!sound->isBuffered)
+               {
+                       delete sound->reader; AUD_DELETE("reader")
+                       alDeleteBuffers(AUD_OPENAL_CYCLE_BUFFERS, sound->buffers);
+               }
+               delete sound; AUD_DELETE("handle")
+               m_pausedSounds->erase(m_pausedSounds->begin());
+       }
+
+       // delete all buffered factories
+       while(!m_bufferedFactories->empty())
+       {
+               alDeleteBuffers(1, &(*(m_bufferedFactories->begin()))->buffer);
+               delete *m_bufferedFactories->begin(); AUD_DELETE("bufferedfactory");
+               m_bufferedFactories->erase(m_bufferedFactories->begin());
+       }
+
+       alcProcessContext(m_context);
+
+       // wait for the thread to stop
+       if(m_playing)
+       {
+               unlock();
+               pthread_join(m_thread, NULL);
+       }
+       else
+               unlock();
+
+       delete m_playingSounds; AUD_DELETE("list")
+       delete m_pausedSounds; AUD_DELETE("list")
+       delete m_bufferedFactories; AUD_DELETE("list")
+
+       // quit OpenAL
+       alcMakeContextCurrent(NULL);
+       alcDestroyContext(m_context);
+       alcCloseDevice(m_device);
+
+       delete m_converter; AUD_DELETE("factory")
+
+       pthread_mutex_destroy(&m_mutex);
+}
+
+AUD_Specs AUD_OpenALDevice::getSpecs()
+{
+       return m_specs;
+}
+
+bool AUD_OpenALDevice::getFormat(ALenum &format, AUD_Specs specs)
+{
+       bool valid = true;
+       format = 0;
+
+       switch(specs.format)
+       {
+       case AUD_FORMAT_U8:
+               switch(specs.channels)
+               {
+               case AUD_CHANNELS_MONO:
+                       format = AL_FORMAT_MONO8;
+                       break;
+               case AUD_CHANNELS_STEREO:
+                       format = AL_FORMAT_STEREO8;
+                       break;
+               case AUD_CHANNELS_SURROUND4:
+                       if(m_useMC)
+                       {
+                               format = alGetEnumValue("AL_FORMAT_QUAD8");
+                               break;
+                       }
+               case AUD_CHANNELS_SURROUND51:
+                       if(m_useMC)
+                       {
+                               format = alGetEnumValue("AL_FORMAT_51CHN8");
+                               break;
+                       }
+               case AUD_CHANNELS_SURROUND61:
+                       if(m_useMC)
+                       {
+                               format = alGetEnumValue("AL_FORMAT_61CHN8");
+                               break;
+                       }
+               case AUD_CHANNELS_SURROUND71:
+                       if(m_useMC)
+                       {
+                               format = alGetEnumValue("AL_FORMAT_71CHN8");
+                               break;
+                       }
+               default:
+                       valid = false;
+               }
+               break;
+       case AUD_FORMAT_S16:
+               switch(specs.channels)
+               {
+               case AUD_CHANNELS_MONO:
+                       format = AL_FORMAT_MONO16;
+                       break;
+               case AUD_CHANNELS_STEREO:
+                       format = AL_FORMAT_STEREO16;
+                       break;
+               case AUD_CHANNELS_SURROUND4:
+                       if(m_useMC)
+                       {
+                               format = alGetEnumValue("AL_FORMAT_QUAD16");
+                               break;
+                       }
+               case AUD_CHANNELS_SURROUND51:
+                       if(m_useMC)
+                       {
+                               format = alGetEnumValue("AL_FORMAT_51CHN16");
+                               break;
+                       }
+               case AUD_CHANNELS_SURROUND61:
+                       if(m_useMC)
+                       {
+                               format = alGetEnumValue("AL_FORMAT_61CHN16");
+                               break;
+                       }
+               case AUD_CHANNELS_SURROUND71:
+                       if(m_useMC)
+                       {
+                               format = alGetEnumValue("AL_FORMAT_71CHN16");
+                               break;
+                       }
+               default:
+                       valid = false;
+               }
+               break;
+       case AUD_FORMAT_FLOAT32:
+               switch(specs.channels)
+               {
+               case AUD_CHANNELS_MONO:
+                       format = alGetEnumValue("AL_FORMAT_MONO_FLOAT32");
+                       break;
+               case AUD_CHANNELS_STEREO:
+                       format = alGetEnumValue("AL_FORMAT_STEREO_FLOAT32");
+                       break;
+               case AUD_CHANNELS_SURROUND4:
+                       if(m_useMC)
+                       {
+                               format = alGetEnumValue("AL_FORMAT_QUAD32");
+                               break;
+                       }
+               case AUD_CHANNELS_SURROUND51:
+                       if(m_useMC)
+                       {
+                               format = alGetEnumValue("AL_FORMAT_51CHN32");
+                               break;
+                       }
+               case AUD_CHANNELS_SURROUND61:
+                       if(m_useMC)
+                       {
+                               format = alGetEnumValue("AL_FORMAT_61CHN32");
+                               break;
+                       }
+               case AUD_CHANNELS_SURROUND71:
+                       if(m_useMC)
+                       {
+                               format = alGetEnumValue("AL_FORMAT_71CHN32");
+                               break;
+                       }
+               default:
+                       valid = false;
+               }
+               break;
+       default:
+               valid = false;
+       }
+
+       if(!format)
+               valid = false;
+
+       return valid;
+}
+
+AUD_Handle* AUD_OpenALDevice::play(AUD_IFactory* factory, bool keep)
+{
+       // check if it is a buffered factory
+       for(AUD_BFIterator i = m_bufferedFactories->begin();
+               i != m_bufferedFactories->end(); i++)
+       {
+               if((*i)->factory == factory)
+               {
+                       // create the handle
+                       AUD_OpenALHandle* sound = new AUD_OpenALHandle; AUD_NEW("handle")
+                       sound->keep = keep;
+                       sound->current = -1;
+                       sound->isBuffered = true;
+                       sound->data_end = true;
+
+                       alcSuspendContext(m_context);
+
+                       // OpenAL playback code
+                       try
+                       {
+                               alGenSources(1, &sound->source);
+                               if(alGetError() != AL_NO_ERROR)
+                                       AUD_THROW(AUD_ERROR_OPENAL);
+
+                               try
+                               {
+                                       alSourcei(sound->source, AL_BUFFER, (*i)->buffer);
+                                       if(alGetError() != AL_NO_ERROR)
+                                               AUD_THROW(AUD_ERROR_OPENAL);
+                               }
+                               catch(AUD_Exception e)
+                               {
+                                       alDeleteSources(1, &sound->source);
+                                       throw;
+                               }
+                       }
+                       catch(AUD_Exception e)
+                       {
+                               delete sound; AUD_DELETE("handle")
+                               alcProcessContext(m_context);
+                               unlock();
+                               throw;
+                       }
+
+                       // play sound
+                       m_playingSounds->push_back(sound);
+
+                       alSourcei(sound->source, AL_SOURCE_RELATIVE, 1);
+                       start();
+
+                       alcProcessContext(m_context);
+                       unlock();
+
+                       return sound;
+               }
+       }
+
+       AUD_IReader* reader = factory->createReader();
+
+       if(reader == NULL)
+               AUD_THROW(AUD_ERROR_READER);
+
+       AUD_Specs specs;
+
+       specs = reader->getSpecs();
+
+       // check format
+       bool valid = true;
+
+       if(specs.format == AUD_FORMAT_INVALID)
+               valid = false;
+       else if(specs.format == AUD_FORMAT_S24 ||
+                       specs.format == AUD_FORMAT_S32 ||
+                       specs.format == AUD_FORMAT_FLOAT32 ||
+                       specs.format == AUD_FORMAT_FLOAT64)
+       {
+               m_converter->setReader(reader);
+               reader = m_converter->createReader();
+               specs = reader->getSpecs();
+       }
+
+       // create the handle
+       AUD_OpenALHandle* sound = new AUD_OpenALHandle; AUD_NEW("handle")
+       sound->keep = keep;
+       sound->reader = reader;
+       sound->current = 0;
+       sound->isBuffered = false;
+       sound->data_end = false;
+
+       valid &= getFormat(sound->format, specs);
+
+       if(!valid)
+       {
+               delete sound; AUD_DELETE("handle")
+               delete reader; AUD_DELETE("reader")
+               return NULL;
+       }
+
+       lock();
+       alcSuspendContext(m_context);
+
+       // OpenAL playback code
+       try
+       {
+               alGenBuffers(AUD_OPENAL_CYCLE_BUFFERS, sound->buffers);
+               if(alGetError() != AL_NO_ERROR)
+                       AUD_THROW(AUD_ERROR_OPENAL);
+
+               try
+               {
+                       sample_t* buf;
+                       int length;
+
+                       for(int i = 0; i < AUD_OPENAL_CYCLE_BUFFERS; i++)
+                       {
+                               length = m_buffersize;
+                               reader->read(length, buf);
+                               alBufferData(sound->buffers[i], sound->format, buf,
+                                                        length * AUD_SAMPLE_SIZE(specs), specs.rate);
+                               if(alGetError() != AL_NO_ERROR)
+                                       AUD_THROW(AUD_ERROR_OPENAL);
+                       }
+
+                       alGenSources(1, &sound->source);
+                       if(alGetError() != AL_NO_ERROR)
+                               AUD_THROW(AUD_ERROR_OPENAL);
+
+                       try
+                       {
+                               alSourceQueueBuffers(sound->source, AUD_OPENAL_CYCLE_BUFFERS,
+                                                                        sound->buffers);
+                               if(alGetError() != AL_NO_ERROR)
+                                       AUD_THROW(AUD_ERROR_OPENAL);
+                       }
+                       catch(AUD_Exception e)
+                       {
+                               alDeleteSources(1, &sound->source);
+                               throw;
+                       }
+               }
+               catch(AUD_Exception e)
+               {
+                       alDeleteBuffers(AUD_OPENAL_CYCLE_BUFFERS, sound->buffers);
+                       throw;
+               }
+       }
+       catch(AUD_Exception e)
+       {
+               delete sound; AUD_DELETE("handle")
+               delete reader; AUD_DELETE("reader")
+               alcProcessContext(m_context);
+               unlock();
+               throw;
+       }
+
+       // play sound
+       m_playingSounds->push_back(sound);
+       alSourcei(sound->source, AL_SOURCE_RELATIVE, 1);
+
+       start();
+
+       alcProcessContext(m_context);
+       unlock();
+
+       return sound;
+}
+
+bool AUD_OpenALDevice::pause(AUD_Handle* handle)
+{
+       // only songs that are played can be paused
+       lock();
+       for(AUD_HandleIterator i = m_playingSounds->begin();
+               i != m_playingSounds->end(); i++)
+       {
+               if(*i == handle)
+               {
+                       m_pausedSounds->push_back(*i);
+                       alSourcePause((*i)->source);
+                       m_playingSounds->erase(i);
+                       unlock();
+                       return true;
+               }
+       }
+       unlock();
+       return false;
+}
+
+bool AUD_OpenALDevice::resume(AUD_Handle* handle)
+{
+       lock();
+
+       // only songs that are paused can be resumed
+       for(AUD_HandleIterator i = m_pausedSounds->begin();
+               i != m_pausedSounds->end(); i++)
+       {
+               if(*i == handle)
+               {
+                       m_playingSounds->push_back(*i);
+                       start();
+                       m_pausedSounds->erase(i);
+                       unlock();
+                       return true;
+               }
+       }
+       unlock();
+       return false;
+}
+
+bool AUD_OpenALDevice::stop(AUD_Handle* handle)
+{
+       AUD_OpenALHandle* sound;
+
+       lock();
+       for(AUD_HandleIterator i = m_playingSounds->begin();
+               i != m_playingSounds->end(); i++)
+       {
+               if(*i == handle)
+               {
+                       sound = *i;
+                       alDeleteSources(1, &sound->source);
+                       if(!sound->isBuffered)
+                       {
+                               delete sound->reader; AUD_DELETE("reader")
+                               alDeleteBuffers(AUD_OPENAL_CYCLE_BUFFERS, sound->buffers);
+                       }
+                       delete *i; AUD_DELETE("handle")
+                       m_playingSounds->erase(i);
+                       unlock();
+                       return true;
+               }
+       }
+       for(AUD_HandleIterator i = m_pausedSounds->begin();
+               i != m_pausedSounds->end(); i++)
+       {
+               if(*i == handle)
+               {
+                       sound = *i;
+                       alDeleteSources(1, &sound->source);
+                       if(!sound->isBuffered)
+                       {
+                               delete sound->reader; AUD_DELETE("reader")
+                               alDeleteBuffers(AUD_OPENAL_CYCLE_BUFFERS, sound->buffers);
+                       }
+                       delete *i; AUD_DELETE("handle")
+                       m_pausedSounds->erase(i);
+                       unlock();
+                       return true;
+               }
+       }
+       unlock();
+       return false;
+}
+
+bool AUD_OpenALDevice::setKeep(AUD_Handle* handle, bool keep)
+{
+       lock();
+       if(isValid(handle))
+       {
+               ((AUD_OpenALHandle*)handle)->keep = keep;
+               unlock();
+               return true;
+       }
+       unlock();
+       return false;
+}
+
+bool AUD_OpenALDevice::sendMessage(AUD_Handle* handle, AUD_Message &message)
+{
+       lock();
+
+       bool result = false;
+
+       if(handle == 0)
+       {
+               for(AUD_HandleIterator i = m_playingSounds->begin();
+                       i != m_playingSounds->end(); i++)
+                       if(!(*i)->isBuffered)
+                               result |= (*i)->reader->notify(message);
+               for(AUD_HandleIterator i = m_pausedSounds->begin();
+                       i != m_pausedSounds->end(); i++)
+                       if(!(*i)->isBuffered)
+                               result |= (*i)->reader->notify(message);
+       }
+       else if(isValid(handle))
+               if(!((AUD_OpenALHandle*)handle)->isBuffered)
+                       result = ((AUD_OpenALHandle*)handle)->reader->notify(message);
+       unlock();
+       return result;
+}
+
+bool AUD_OpenALDevice::seek(AUD_Handle* handle, float position)
+{
+       lock();
+
+       if(isValid(handle))
+       {
+               AUD_OpenALHandle* alhandle = (AUD_OpenALHandle*)handle;
+               if(alhandle->isBuffered)
+                       alSourcef(alhandle->source, AL_SEC_OFFSET, position);
+               else
+               {
+                       alhandle->reader->seek((int)(position *
+                                                                                alhandle->reader->getSpecs().rate));
+                       alhandle->data_end = false;
+
+                       ALint info;
+
+                       alGetSourcei(alhandle->source, AL_SOURCE_STATE, &info);
+
+                       if(info != AL_PLAYING)
+                       {
+                               if(info != AL_STOPPED)
+                                       alSourceStop(alhandle->source);
+
+                               alSourceUnqueueBuffers(alhandle->source,
+                                                                          AUD_OPENAL_CYCLE_BUFFERS,
+                                                                          alhandle->buffers);
+                               if(alGetError() == AL_NO_ERROR)
+                               {
+                                       sample_t* buf;
+                                       int length;
+                                       AUD_Specs specs = alhandle->reader->getSpecs();
+
+                                       for(int i = 0; i < AUD_OPENAL_CYCLE_BUFFERS; i++)
+                                       {
+                                               length = m_buffersize;
+                                               alhandle->reader->read(length, buf);
+                                               alBufferData(alhandle->buffers[i], alhandle->format,
+                                                                        buf, length * AUD_SAMPLE_SIZE(specs),
+                                                                        specs.rate);
+
+                                               if(alGetError() != AL_NO_ERROR)
+                                                       break;
+                                       }
+
+                                       alSourceQueueBuffers(alhandle->source,
+                                                                                AUD_OPENAL_CYCLE_BUFFERS,
+                                                                                alhandle->buffers);
+                               }
+
+                               alSourceRewind(alhandle->source);
+                       }
+               }
+               unlock();
+               return true;
+       }
+
+       unlock();
+       return false;
+}
+
+float AUD_OpenALDevice::getPosition(AUD_Handle* handle)
+{
+       lock();
+
+       float position = 0.0;
+
+       if(isValid(handle))
+       {
+               AUD_OpenALHandle* h = (AUD_OpenALHandle*)handle;
+               if(h->isBuffered)
+                       alGetSourcef(h->source, AL_SEC_OFFSET, &position);
+               else
+                       position = h->reader->getPosition() /
+                                          (float)h->reader->getSpecs().rate;
+       }
+
+       unlock();
+       return position;
+}
+
+AUD_Status AUD_OpenALDevice::getStatus(AUD_Handle* handle)
+{
+       lock();
+       for(AUD_HandleIterator i = m_playingSounds->begin();
+               i != m_playingSounds->end(); i++)
+       {
+               if(*i == handle)
+               {
+                       unlock();
+                       return AUD_STATUS_PLAYING;
+               }
+       }
+       for(AUD_HandleIterator i = m_pausedSounds->begin();
+               i != m_pausedSounds->end(); i++)
+       {
+               if(*i == handle)
+               {
+                       unlock();
+                       return AUD_STATUS_PAUSED;
+               }
+       }
+       unlock();
+       return AUD_STATUS_INVALID;
+}
+
+void AUD_OpenALDevice::lock()
+{
+       pthread_mutex_lock(&m_mutex);
+}
+
+void AUD_OpenALDevice::unlock()
+{
+       pthread_mutex_unlock(&m_mutex);
+}
+
+/******************************************************************************/
+/**************************** Capabilities Code *******************************/
+/******************************************************************************/
+
+bool AUD_OpenALDevice::checkCapability(int capability)
+{
+       return capability == AUD_CAPS_3D_DEVICE ||
+                  capability == AUD_CAPS_VOLUME ||
+                  capability == AUD_CAPS_SOURCE_VOLUME ||
+                  capability == AUD_CAPS_SOURCE_PITCH ||
+                  capability == AUD_CAPS_BUFFERED_FACTORY;
+}
+
+bool AUD_OpenALDevice::setCapability(int capability, void *value)
+{
+       switch(capability)
+       {
+       case AUD_CAPS_VOLUME:
+               alListenerf(AL_GAIN, *((float*)value));
+               return true;
+       case AUD_CAPS_SOURCE_VOLUME:
+               {
+                       AUD_SourceCaps* caps = (AUD_SourceCaps*) value;
+                       lock();
+                       if(isValid(caps->handle))
+                       {
+                               alSourcef(((AUD_OpenALHandle*)caps->handle)->source,
+                                                 AL_GAIN, caps->value);
+                               unlock();
+                               return true;
+                       }
+                       unlock();
+               }
+               break;
+       case AUD_CAPS_SOURCE_PITCH:
+               {
+                       AUD_SourceCaps* caps = (AUD_SourceCaps*) value;
+                       lock();
+                       if(isValid(caps->handle))
+                       {
+                               alSourcef(((AUD_OpenALHandle*)caps->handle)->source,
+                                                 AL_PITCH, caps->value);
+                               unlock();
+                               return true;
+                       }
+                       unlock();
+               }
+               break;
+       case AUD_CAPS_BUFFERED_FACTORY:
+               {
+                       AUD_IFactory* factory = (AUD_IFactory*) value;
+
+                       // load the factory into an OpenAL buffer
+                       if(factory)
+                       {
+                               lock();
+                               for(AUD_BFIterator i = m_bufferedFactories->begin();
+                                       i != m_bufferedFactories->end(); i++)
+                               {
+                                       if((*i)->factory == factory)
+                                       {
+                                               unlock();
+                                               return true;
+                                       }
+                               }
+                               unlock();
+
+                               AUD_IReader* reader = factory->createReader();
+
+                               if(reader == NULL)
+                                       return false;
+
+                               AUD_Specs specs;
+
+                               specs = reader->getSpecs();
+
+                               // determine format
+                               bool valid = reader->getType() == AUD_TYPE_BUFFER;
+
+                               if(valid)
+                               {
+                                       if(specs.format == AUD_FORMAT_INVALID)
+                                               valid = false;
+                                       else if(specs.format == AUD_FORMAT_S24 ||
+                                                       specs.format == AUD_FORMAT_S32 ||
+                                                       specs.format == AUD_FORMAT_FLOAT32 ||
+                                                       specs.format == AUD_FORMAT_FLOAT64)
+                                       {
+                                               m_converter->setReader(reader);
+                                               reader = m_converter->createReader();
+                                               specs = reader->getSpecs();
+                                       }
+                               }
+
+                               ALenum format;
+
+                               if(valid)
+                                       valid = getFormat(format, specs);
+
+                               if(!valid)
+                               {
+                                       delete reader; AUD_DELETE("reader")
+                                       return false;
+                               }
+
+                               // load into a buffer
+                               lock();
+                               alcSuspendContext(m_context);
+
+                               AUD_OpenALBufferedFactory* bf = new AUD_OpenALBufferedFactory;
+                               AUD_NEW("bufferedfactory");
+                               bf->factory = factory;
+
+                               try
+                               {
+                                       alGenBuffers(1, &bf->buffer);
+                                       if(alGetError() != AL_NO_ERROR)
+                                               AUD_THROW(AUD_ERROR_OPENAL);
+
+                                       try
+                                       {
+                                               sample_t* buf;
+                                               int length = reader->getLength();
+
+                                               reader->read(length, buf);
+                                               alBufferData(bf->buffer, format, buf,
+                                                                        length * AUD_SAMPLE_SIZE(specs),
+                                                                        specs.rate);
+                                               if(alGetError() != AL_NO_ERROR)
+                                                       AUD_THROW(AUD_ERROR_OPENAL);
+                                       }
+                                       catch(AUD_Exception e)
+                                       {
+                                               alDeleteBuffers(1, &bf->buffer);
+                                               throw;
+                                       }
+                               }
+                               catch(AUD_Exception e)
+                               {
+                                       delete bf; AUD_DELETE("bufferedfactory")
+                                       delete reader; AUD_DELETE("reader")
+                                       alcProcessContext(m_context);
+                                       unlock();
+                                       return false;
+                               }
+
+                               m_bufferedFactories->push_back(bf);
+
+                               alcProcessContext(m_context);
+                               unlock();
+                       }
+                       else
+                       {
+                               // stop all playing and paused buffered sources
+                               lock();
+                               alcSuspendContext(m_context);
+
+                               AUD_OpenALHandle* sound;
+                               AUD_HandleIterator it = m_playingSounds->begin();
+                               while(it != m_playingSounds->end())
+                               {
+                                       sound = *it;
+                                       ++it;
+
+                                       if(sound->isBuffered)
+                                               stop(sound);
+                               }
+                               alcProcessContext(m_context);
+
+                               while(!m_bufferedFactories->empty())
+                               {
+                                       alDeleteBuffers(1,
+                                                                       &(*(m_bufferedFactories->begin()))->buffer);
+                                       delete *m_bufferedFactories->begin();
+                                       AUD_DELETE("bufferedfactory");
+                                       m_bufferedFactories->erase(m_bufferedFactories->begin());
+                               }
+                               unlock();
+                       }
+
+                       return true;
+               }
+               break;
+       }
+       return false;
+}
+
+bool AUD_OpenALDevice::getCapability(int capability, void *value)
+{
+       switch(capability)
+       {
+       case AUD_CAPS_VOLUME:
+               alGetListenerf(AL_GAIN, (float*)value);
+               return true;
+       case AUD_CAPS_SOURCE_VOLUME:
+               {
+                       AUD_SourceCaps* caps = (AUD_SourceCaps*) value;
+                       lock();
+                       if(isValid(caps->handle))
+                       {
+                               alGetSourcef(((AUD_OpenALHandle*)caps->handle)->source,
+                                                 AL_GAIN, &caps->value);
+                               unlock();
+                               return true;
+                       }
+                       unlock();
+               }
+               break;
+       case AUD_CAPS_SOURCE_PITCH:
+               {
+                       AUD_SourceCaps* caps = (AUD_SourceCaps*) value;
+                       lock();
+                       if(isValid(caps->handle))
+                       {
+                               alGetSourcef(((AUD_OpenALHandle*)caps->handle)->source,
+                                                 AL_PITCH, &caps->value);
+                               unlock();
+                               return true;
+                       }
+                       unlock();
+               }
+               break;
+       }
+       return false;
+}
+
+/******************************************************************************/
+/**************************** 3D Device Code **********************************/
+/******************************************************************************/
+
+AUD_Handle* AUD_OpenALDevice::play3D(AUD_IFactory* factory, bool keep)
+{
+       AUD_OpenALHandle* handle = (AUD_OpenALHandle*)play(factory, keep);
+       if(handle)
+               alSourcei(handle->source, AL_SOURCE_RELATIVE, 0);
+       return handle;
+}
+
+bool AUD_OpenALDevice::updateListener(AUD_3DData &data)
+{
+       alListenerfv(AL_POSITION, (ALfloat*)data.position);
+       alListenerfv(AL_VELOCITY, (ALfloat*)data.velocity);
+       alListenerfv(AL_ORIENTATION, (ALfloat*)&(data.orientation[3]));
+
+       return true;
+}
+
+bool AUD_OpenALDevice::setSetting(AUD_3DSetting setting, float value)
+{
+       switch(setting)
+       {
+       case AUD_3DS_DISTANCE_MODEL:
+               if(value == AUD_DISTANCE_MODEL_NONE)
+                       alDistanceModel(AL_NONE);
+               else if(value == AUD_DISTANCE_MODEL_INVERSE)
+                       alDistanceModel(AL_INVERSE_DISTANCE);
+               else if(value == AUD_DISTANCE_MODEL_INVERSE_CLAMPED)
+                       alDistanceModel(AL_INVERSE_DISTANCE_CLAMPED);
+               else if(value == AUD_DISTANCE_MODEL_LINEAR)
+                       alDistanceModel(AL_LINEAR_DISTANCE);
+               else if(value == AUD_DISTANCE_MODEL_LINEAR_CLAMPED)
+                       alDistanceModel(AL_LINEAR_DISTANCE_CLAMPED);
+               else if(value == AUD_DISTANCE_MODEL_EXPONENT)
+                       alDistanceModel(AL_EXPONENT_DISTANCE);
+               else if(value == AUD_DISTANCE_MODEL_EXPONENT_CLAMPED)
+                       alDistanceModel(AL_EXPONENT_DISTANCE_CLAMPED);
+               else
+                       return false;
+               return true;
+       case AUD_3DS_DOPPLER_FACTOR:
+               alDopplerFactor(value);
+               return true;
+       case AUD_3DS_SPEED_OF_SOUND:
+               alSpeedOfSound(value);
+               return true;
+       default:
+               return false;
+       }
+}
+
+float AUD_OpenALDevice::getSetting(AUD_3DSetting setting)
+{
+       switch(setting)
+       {
+       case AUD_3DS_DISTANCE_MODEL:
+               switch(alGetInteger(AL_DISTANCE_MODEL))
+               {
+                       case AL_NONE:
+                               return AUD_DISTANCE_MODEL_NONE;
+                       case AL_INVERSE_DISTANCE:
+                               return AUD_DISTANCE_MODEL_INVERSE;
+                       case AL_INVERSE_DISTANCE_CLAMPED:
+                               return AUD_DISTANCE_MODEL_INVERSE_CLAMPED;
+                       case AL_LINEAR_DISTANCE:
+                               return AUD_DISTANCE_MODEL_LINEAR;
+                       case AL_LINEAR_DISTANCE_CLAMPED:
+                               return AUD_DISTANCE_MODEL_LINEAR_CLAMPED;
+                       case AL_EXPONENT_DISTANCE:
+                               return AUD_DISTANCE_MODEL_EXPONENT;
+                       case AL_EXPONENT_DISTANCE_CLAMPED:
+                               return AUD_DISTANCE_MODEL_EXPONENT_CLAMPED;
+               }
+       case AUD_3DS_DOPPLER_FACTOR:
+               return alGetFloat(AL_DOPPLER_FACTOR);
+       case AUD_3DS_SPEED_OF_SOUND:
+               return alGetFloat(AL_SPEED_OF_SOUND);
+       default:
+               return std::numeric_limits<float>::quiet_NaN();
+       }
+}
+
+bool AUD_OpenALDevice::updateSource(AUD_Handle* handle, AUD_3DData &data)
+{
+       lock();
+
+       if(isValid(handle))
+       {
+               int source = ((AUD_OpenALHandle*)handle)->source;
+               alSourcefv(source, AL_POSITION, (ALfloat*)data.position);
+               alSourcefv(source, AL_VELOCITY, (ALfloat*)data.velocity);
+               alSourcefv(source, AL_DIRECTION, (ALfloat*)&(data.orientation[3]));
+               unlock();
+               return true;
+       }
+
+       unlock();
+       return false;
+}
+
+bool AUD_OpenALDevice::setSourceSetting(AUD_Handle* handle,
+                                                                               AUD_3DSourceSetting setting,
+                                                                               float value)
+{
+       lock();
+
+       bool result = false;
+
+       if(isValid(handle))
+       {
+               int source = ((AUD_OpenALHandle*)handle)->source;
+
+               switch(setting)
+               {
+               case AUD_3DSS_CONE_INNER_ANGLE:
+                       alSourcef(source, AL_CONE_INNER_ANGLE, value);
+                       result = true;
+                       break;
+               case AUD_3DSS_CONE_OUTER_ANGLE:
+                       alSourcef(source, AL_CONE_OUTER_ANGLE, value);
+                       result = true;
+                       break;
+               case AUD_3DSS_CONE_OUTER_GAIN:
+                       alSourcef(source, AL_CONE_OUTER_GAIN, value);
+                       result = true;
+                       break;
+               case AUD_3DSS_IS_RELATIVE:
+                       alSourcei(source, AL_SOURCE_RELATIVE, value > 0.0);
+                       result = true;
+                       break;
+               case AUD_3DSS_MAX_DISTANCE:
+                       alSourcef(source, AL_MAX_DISTANCE, value);
+                       result = true;
+                       break;
+               case AUD_3DSS_MAX_GAIN:
+                       alSourcef(source, AL_MAX_GAIN, value);
+                       result = true;
+                       break;
+               case AUD_3DSS_MIN_GAIN:
+                       alSourcef(source, AL_MIN_GAIN, value);
+                       result = true;
+                       break;
+               case AUD_3DSS_REFERENCE_DISTANCE:
+                       alSourcef(source, AL_REFERENCE_DISTANCE, value);
+                       result = true;
+                       break;
+               case AUD_3DSS_ROLLOFF_FACTOR:
+                       alSourcef(source, AL_ROLLOFF_FACTOR, value);
+                       result = true;
+                       break;
+               default:
+                       break;
+               }
+       }
+
+       unlock();
+       return result;
+}
+
+float AUD_OpenALDevice::getSourceSetting(AUD_Handle* handle,
+                                                                                AUD_3DSourceSetting setting)
+{
+       float result = std::numeric_limits<float>::quiet_NaN();;
+
+       lock();
+
+       if(isValid(handle))
+       {
+               int source = ((AUD_OpenALHandle*)handle)->source;
+
+               switch(setting)
+               {
+               case AUD_3DSS_CONE_INNER_ANGLE:
+                       alGetSourcef(source, AL_CONE_INNER_ANGLE, &result);
+                       break;
+               case AUD_3DSS_CONE_OUTER_ANGLE:
+                       alGetSourcef(source, AL_CONE_OUTER_ANGLE, &result);
+                       break;
+               case AUD_3DSS_CONE_OUTER_GAIN:
+                       alGetSourcef(source, AL_CONE_OUTER_GAIN, &result);
+                       break;
+               case AUD_3DSS_IS_RELATIVE:
+                       {
+                               ALint i;
+                               alGetSourcei(source, AL_SOURCE_RELATIVE, &i);
+                               result = i ? 1.0 : 0.0;
+                               break;
+                       }
+               case AUD_3DSS_MAX_DISTANCE:
+                       alGetSourcef(source, AL_MAX_DISTANCE, &result);
+                       break;
+               case AUD_3DSS_MAX_GAIN:
+                       alGetSourcef(source, AL_MAX_GAIN, &result);
+                       break;
+               case AUD_3DSS_MIN_GAIN:
+                       alGetSourcef(source, AL_MIN_GAIN, &result);
+                       break;
+               case AUD_3DSS_REFERENCE_DISTANCE:
+                       alGetSourcef(source, AL_REFERENCE_DISTANCE, &result);
+                       break;
+               case AUD_3DSS_ROLLOFF_FACTOR:
+                       alGetSourcef(source, AL_ROLLOFF_FACTOR, &result);
+                       break;
+               default:
+                       break;
+               }
+       }
+
+       unlock();
+       return result;
+}
diff --git a/intern/audaspace/OpenAL/AUD_OpenALDevice.h b/intern/audaspace/OpenAL/AUD_OpenALDevice.h
new file mode 100644 (file)
index 0000000..074cd3d
--- /dev/null
@@ -0,0 +1,171 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#ifndef AUD_OPENALDEVICE
+#define AUD_OPENALDEVICE
+
+#include "AUD_IDevice.h"
+#include "AUD_I3DDevice.h"
+struct AUD_OpenALHandle;
+struct AUD_OpenALBufferedFactory;
+class AUD_ConverterFactory;
+
+#include <AL/al.h>
+#include <AL/alc.h>
+#include <list>
+#include <pthread.h>
+
+/**
+ * This device plays through OpenAL.
+ */
+class AUD_OpenALDevice : public AUD_IDevice, public AUD_I3DDevice
+{
+private:
+       /**
+        * The OpenAL device handle.
+        */
+       ALCdevice* m_device;
+
+       /**
+        * The OpenAL context.
+        */
+       ALCcontext* m_context;
+
+       /**
+        * The specification of the device.
+        */
+       AUD_Specs m_specs;
+
+       /**
+        * Whether the device has the AL_EXT_MCFORMATS extension.
+        */
+       bool m_useMC;
+
+       /**
+        * The converter factory for readers with wrong input format.
+        */
+       AUD_ConverterFactory* m_converter;
+
+       /**
+        * The list of sounds that are currently playing.
+        */
+       std::list<AUD_OpenALHandle*>* m_playingSounds;
+
+       /**
+        * The list of sounds that are currently paused.
+        */
+       std::list<AUD_OpenALHandle*>* m_pausedSounds;
+
+       /**
+        * The list of buffered factories.
+        */
+       std::list<AUD_OpenALBufferedFactory*>* m_bufferedFactories;
+
+       /**
+        * The mutex for locking.
+        */
+       pthread_mutex_t m_mutex;
+
+       /**
+        * The streaming thread.
+        */
+       pthread_t m_thread;
+
+       /**
+        * The condition for streaming thread wakeup.
+        */
+       bool m_playing;
+
+       /**
+        * Buffer size.
+        */
+       int m_buffersize;
+
+       /**
+        * Starts the streaming thread.
+        */
+       void start();
+
+       /**
+        * Checks if a handle is valid.
+        * \param handle The handle to check.
+        * \return Whether the handle is valid.
+        */
+       bool isValid(AUD_Handle* handle);
+
+       /**
+        * Gets the format according to the specs.
+        * \param format The variable to put the format into.
+        * \param specs The specs to read the format from.
+        * \return Whether the format is valid or not.
+        */
+       bool getFormat(ALenum &format, AUD_Specs specs);
+
+public:
+       /**
+        * Opens the OpenAL audio device for playback.
+        * \param specs The wanted audio specification.
+        * \param buffersize The size of the internal buffer.
+        * \note The specification really used for opening the device may differ.
+        * \note The buffersize will be multiplicated by three for this device.
+        * \exception AUD_Exception Thrown if the audio device cannot be opened.
+        */
+       AUD_OpenALDevice(AUD_Specs specs, int buffersize = AUD_DEFAULT_BUFFER_SIZE);
+
+       /**
+        * Streaming thread main function.
+        */
+       void updateStreams();
+
+       virtual ~AUD_OpenALDevice();
+
+       virtual AUD_Specs getSpecs();
+       virtual AUD_Handle* play(AUD_IFactory* factory, bool keep = false);
+       virtual bool pause(AUD_Handle* handle);
+       virtual bool resume(AUD_Handle* handle);
+       virtual bool stop(AUD_Handle* handle);
+       virtual bool setKeep(AUD_Handle* handle, bool keep);
+       virtual bool sendMessage(AUD_Handle* handle, AUD_Message &message);
+       virtual bool seek(AUD_Handle* handle, float position);
+       virtual float getPosition(AUD_Handle* handle);
+       virtual AUD_Status getStatus(AUD_Handle* handle);
+       virtual void lock();
+       virtual void unlock();
+       virtual bool checkCapability(int capability);
+       virtual bool setCapability(int capability, void *value);
+       virtual bool getCapability(int capability, void *value);
+
+       virtual AUD_Handle* play3D(AUD_IFactory* factory, bool keep = false);
+       virtual bool updateListener(AUD_3DData &data);
+       virtual bool setSetting(AUD_3DSetting setting, float value);
+       virtual float getSetting(AUD_3DSetting setting);
+       virtual bool updateSource(AUD_Handle* handle, AUD_3DData &data);
+       virtual bool setSourceSetting(AUD_Handle* handle,
+                                                                 AUD_3DSourceSetting setting, float value);
+       virtual float getSourceSetting(AUD_Handle* handle,
+                                                                  AUD_3DSourceSetting setting);
+};
+
+#endif //AUD_OPENALDEVICE
diff --git a/intern/audaspace/SConscript b/intern/audaspace/SConscript
new file mode 100644 (file)
index 0000000..4cb3e72
--- /dev/null
@@ -0,0 +1,24 @@
+#!/usr/bin/python
+
+Import ('env')
+
+sources = env.Glob('intern/*.cpp') + env.Glob('FX/*.cpp') + env.Glob('SRC/*.cpp')
+incs = '. intern FX SRC ' + env['BF_PTHREADS_INC'] + ' ' + env['BF_LIBSAMPLERATE_INC']
+defs = []
+
+if env['WITH_BF_FFMPEG']:
+       sources += env.Glob('ffmpeg/*.cpp')
+       incs += ' ffmpeg ' + env['BF_FFMPEG_INC']
+       defs.append('WITH_FFMPEG')
+
+if env['WITH_BF_SDL']:
+       sources += env.Glob('SDL/*.cpp')
+       incs += ' SDL ' + env['BF_SDL_INC']
+       defs.append('WITH_SDL')
+
+if env['WITH_BF_OPENAL']:
+       sources += env.Glob('OpenAL/*.cpp')
+       incs += ' OpenAL ' + env['BF_OPENAL_INC']
+       defs.append('WITH_OPENAL')
+
+env.BlenderLib ('bf_audaspace', sources, Split(incs), defs, libtype=['intern'], priority = [25] )
diff --git a/intern/audaspace/SDL/AUD_SDLDevice.cpp b/intern/audaspace/SDL/AUD_SDLDevice.cpp
new file mode 100644 (file)
index 0000000..9ea5f1a
--- /dev/null
@@ -0,0 +1,97 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#include "AUD_SDLMixer.h"
+#include "AUD_SDLDevice.h"
+#include "AUD_IReader.h"
+
+#include <SDL.h>
+
+// this is the callback function for SDL, it only calls the class
+void mixAudio(void *data, Uint8* buffer, int length)
+{
+       AUD_SDLDevice* device = (AUD_SDLDevice*)data;
+       device->SDLmix((sample_t *)buffer, length);
+}
+
+AUD_SDLDevice::AUD_SDLDevice(AUD_Specs specs, int buffersize)
+{
+       if(specs.channels == AUD_CHANNELS_INVALID)
+               specs.channels = AUD_CHANNELS_STEREO;
+       if(specs.format == AUD_FORMAT_INVALID)
+               specs.format = AUD_FORMAT_S16;
+       if(specs.rate == AUD_RATE_INVALID)
+               specs.rate = AUD_RATE_44100;
+
+       m_specs = specs;
+
+       SDL_AudioSpec format, obtained;
+
+       format.freq = m_specs.rate;
+       if(m_specs.format == AUD_FORMAT_U8)
+               format.format = AUDIO_U8;
+       else
+               format.format = AUDIO_S16SYS;
+       format.channels = m_specs.channels;
+       format.samples = buffersize;
+       format.callback = &mixAudio;
+       format.userdata = this;
+
+       if(SDL_OpenAudio(&format, &obtained) != 0)
+               AUD_THROW(AUD_ERROR_SDL);
+
+       m_specs.rate = (AUD_SampleRate)obtained.freq;
+       m_specs.channels = (AUD_Channels)obtained.channels;
+       if(obtained.format == AUDIO_U8)
+               m_specs.format = AUD_FORMAT_U8;
+       else if(obtained.format == AUDIO_S16LSB || obtained.format == AUDIO_S16MSB)
+               m_specs.format = AUD_FORMAT_S16;
+       else
+               AUD_THROW(AUD_ERROR_SDL);
+
+       m_mixer = new AUD_SDLMixer(); AUD_NEW("mixer")
+       m_mixer->setSpecs(m_specs);
+
+       create();
+}
+
+AUD_SDLDevice::~AUD_SDLDevice()
+{
+       lock();
+       SDL_CloseAudio();
+       unlock();
+
+       destroy();
+}
+
+void AUD_SDLDevice::SDLmix(sample_t* buffer, int length)
+{
+       mix(buffer, length/AUD_SAMPLE_SIZE(m_specs));
+}
+
+void AUD_SDLDevice::playing(bool playing)
+{
+       SDL_PauseAudio(playing ? 0 : 1);
+}
diff --git a/intern/audaspace/SDL/AUD_SDLDevice.h b/intern/audaspace/SDL/AUD_SDLDevice.h
new file mode 100644 (file)
index 0000000..3eb93d2
--- /dev/null
@@ -0,0 +1,63 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#ifndef AUD_SDLDEVICE
+#define AUD_SDLDEVICE
+
+#include "AUD_SoftwareDevice.h"
+
+/**
+ * This device plays back through SDL, the simple direct media layer.
+ */
+class AUD_SDLDevice : public AUD_SoftwareDevice
+{
+protected:
+       virtual void playing(bool playing);
+
+public:
+       /**
+        * Opens the SDL audio device for playback.
+        * \param specs The wanted audio specification.
+        * \param buffersize The size of the internal buffer.
+        * \note The specification really used for opening the device may differ.
+        * \exception AUD_Exception Thrown if the audio device cannot be opened.
+        */
+       AUD_SDLDevice(AUD_Specs specs, int buffersize = AUD_DEFAULT_BUFFER_SIZE);
+
+       /**
+        * Closes the SDL audio device.
+        */
+       virtual ~AUD_SDLDevice();
+
+       /**
+        * Mixes the next bytes into the buffer.
+        * \param buffer The target buffer.
+        * \param length The length in bytes to be filled.
+        * \warning This function shall not be called from outside!
+        */
+       void SDLmix(sample_t* buffer, int length);
+};
+
+#endif //AUD_SDLDEVICE
diff --git a/intern/audaspace/SDL/AUD_SDLMixer.cpp b/intern/audaspace/SDL/AUD_SDLMixer.cpp
new file mode 100644 (file)
index 0000000..cacc0c7
--- /dev/null
@@ -0,0 +1,83 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#include "AUD_SDLMixer.h"
+#include "AUD_SDLMixerFactory.h"
+
+#include <SDL.h>
+
+AUD_SDLMixer::AUD_SDLMixer()
+{
+       m_factory = NULL;
+}
+
+AUD_SDLMixer::~AUD_SDLMixer()
+{
+       if(m_factory)
+       {
+               delete m_factory; AUD_DELETE("factory")
+       }
+}
+
+AUD_IReader* AUD_SDLMixer::prepare(AUD_IReader* reader)
+{
+       m_factory->setReader(reader);
+       return m_factory->createReader();
+}
+
+void AUD_SDLMixer::setSpecs(AUD_Specs specs)
+{
+       m_samplesize = AUD_SAMPLE_SIZE(specs);
+       if(m_factory)
+       {
+               delete m_factory; AUD_DELETE("factory")
+       }
+       m_factory = new AUD_SDLMixerFactory(specs); AUD_NEW("factory")
+}
+
+void AUD_SDLMixer::add(sample_t* buffer, AUD_Specs specs, int length,
+                                          float volume)
+{
+       AUD_SDLMixerBuffer buf;
+       buf.buffer = buffer;
+       buf.length = length;
+       buf.volume = volume;
+       m_buffers.push_back(buf);
+}
+
+void AUD_SDLMixer::superpose(sample_t* buffer, int length, float volume)
+{
+       AUD_SDLMixerBuffer buf;
+
+       while(!m_buffers.empty())
+       {
+               buf = m_buffers.front();
+               m_buffers.pop_front();
+               SDL_MixAudio((Uint8*)buffer,
+                                        (Uint8*)buf.buffer,
+                                        buf.length * m_samplesize,
+                                        (int)(SDL_MIX_MAXVOLUME * volume * buf.volume));
+       }
+}
diff --git a/intern/audaspace/SDL/AUD_SDLMixer.h b/intern/audaspace/SDL/AUD_SDLMixer.h
new file mode 100644 (file)
index 0000000..2cc4e51
--- /dev/null
@@ -0,0 +1,76 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#ifndef AUD_SDLMIXER
+#define AUD_SDLMIXER
+
+#include "AUD_IMixer.h"
+class AUD_SDLMixerFactory;
+#include <list>
+
+struct AUD_SDLMixerBuffer
+{
+       sample_t* buffer;
+       int length;
+       float volume;
+};
+
+/**
+ * This class is able to mix audiosignals with the help of SDL.
+ */
+class AUD_SDLMixer : public AUD_IMixer
+{
+private:
+       /**
+        * The mixer factory that prepares all readers for superposition.
+        */
+       AUD_SDLMixerFactory* m_factory;
+
+       /**
+        * The list of buffers to superpose.
+        */
+       std::list<AUD_SDLMixerBuffer> m_buffers;
+
+       /**
+        * The size of an output sample.
+        */
+       int m_samplesize;
+
+public:
+       /**
+        * Creates the mixer.
+        */
+       AUD_SDLMixer();
+
+       virtual ~AUD_SDLMixer();
+
+       virtual AUD_IReader* prepare(AUD_IReader* reader);
+       virtual void setSpecs(AUD_Specs specs);
+       virtual void add(sample_t* buffer, AUD_Specs specs, int length,
+                                        float volume);
+       virtual void superpose(sample_t* buffer, int length, float volume);
+};
+
+#endif //AUD_SDLMIXER
diff --git a/intern/audaspace/SDL/AUD_SDLMixerFactory.cpp b/intern/audaspace/SDL/AUD_SDLMixerFactory.cpp
new file mode 100644 (file)
index 0000000..1633a14
--- /dev/null
@@ -0,0 +1,63 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#include "AUD_SDLMixerFactory.h"
+#include "AUD_SDLMixerReader.h"
+
+AUD_SDLMixerFactory::AUD_SDLMixerFactory(AUD_IReader* reader, AUD_Specs specs) :
+               AUD_MixerFactory(reader, specs) {}
+
+AUD_SDLMixerFactory::AUD_SDLMixerFactory(AUD_IFactory* factory, AUD_Specs specs) :
+               AUD_MixerFactory(factory, specs) {}
+
+AUD_SDLMixerFactory::AUD_SDLMixerFactory(AUD_Specs specs) :
+               AUD_MixerFactory(specs) {}
+
+AUD_IReader* AUD_SDLMixerFactory::createReader()
+{
+       AUD_IReader* reader = getReader();
+
+       if(reader != 0)
+       {
+               AUD_Specs specs = reader->getSpecs();
+               if(memcmp(&m_specs, &specs, sizeof(AUD_Specs)) != 0)
+               {
+                       try
+                       {
+                               reader = new AUD_SDLMixerReader(reader, m_specs);
+                               AUD_NEW("reader")
+                       }
+                       catch(AUD_Exception e)
+                       {
+                               // return 0 in case SDL cannot mix the source
+                               if(e.error != AUD_ERROR_SDL)
+                                       throw;
+                               else
+                                       reader = NULL;
+                       }
+               }
+       }
+       return reader;
+}
diff --git a/intern/audaspace/SDL/AUD_SDLMixerFactory.h b/intern/audaspace/SDL/AUD_SDLMixerFactory.h
new file mode 100644 (file)
index 0000000..44b36d0
--- /dev/null
@@ -0,0 +1,45 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#ifndef AUD_SDLMIXERFACTORY
+#define AUD_SDLMIXERFACTORY
+
+#include "AUD_MixerFactory.h"
+
+/**
+ * This factory creates a resampling reader that uses SDL's resampling
+ * functionality which unfortunately is very very very limited.
+ */
+class AUD_SDLMixerFactory : public AUD_MixerFactory
+{
+public:
+       AUD_SDLMixerFactory(AUD_IReader* reader, AUD_Specs specs);
+       AUD_SDLMixerFactory(AUD_IFactory* factory, AUD_Specs specs);
+       AUD_SDLMixerFactory(AUD_Specs specs);
+
+       virtual AUD_IReader* createReader();
+};
+
+#endif //AUD_SDLMIXERFACTORY
diff --git a/intern/audaspace/SDL/AUD_SDLMixerReader.cpp b/intern/audaspace/SDL/AUD_SDLMixerReader.cpp
new file mode 100644 (file)
index 0000000..1a0d990
--- /dev/null
@@ -0,0 +1,214 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#include "AUD_SDLMixerReader.h"
+#include "AUD_Buffer.h"
+
+inline Uint16 AUD_TO_SDL(AUD_SampleFormat format)
+{
+       // SDL only supports 8 and 16 bit audio
+       switch(format)
+       {
+       case AUD_FORMAT_U8:
+               return AUDIO_U8;
+       case AUD_FORMAT_S16:
+               return AUDIO_S16SYS;
+       default:
+               AUD_THROW(AUD_ERROR_SDL);
+       }
+}
+
+// greatest common divisor
+inline int gcd(int a, int b)
+{
+       int c;
+
+       // make sure a is the bigger
+       if(b > a)
+       {
+               c = b;
+               b = a;
+               a = c;
+       }
+
+       // greetings from Euclides
+       while(b != 0)
+       {
+               c = a % b;
+               a = b;
+               b = c;
+       }
+       return a;
+}
+
+AUD_SDLMixerReader::AUD_SDLMixerReader(AUD_IReader* reader,
+                                                                                        AUD_Specs specs)
+{
+       if(reader == NULL)
+               AUD_THROW(AUD_ERROR_READER);
+
+       m_reader = reader;
+       m_tspecs = specs;
+       m_sspecs = reader->getSpecs();
+
+       try
+       {
+               // SDL only supports 8 and 16 bit sample formats
+               if(SDL_BuildAudioCVT(&m_cvt,
+                                                        AUD_TO_SDL(m_sspecs.format),
+                                                        m_sspecs.channels,
+                                                        m_sspecs.rate,
+                                                        AUD_TO_SDL(specs.format),
+                                                        specs.channels,
+                                                        specs.rate) == -1)
+                       AUD_THROW(AUD_ERROR_SDL);
+       }
+       catch(AUD_Exception e)
+       {
+               delete m_reader; AUD_DELETE("reader")
+               throw;
+       }
+
+       m_eor = false;
+       m_rsposition = 0;
+       m_rssize = 0;
+       m_ssize = m_sspecs.rate / gcd(specs.rate, m_sspecs.rate);
+       m_tsize = m_tspecs.rate * m_ssize / m_sspecs.rate;
+
+       m_buffer = new AUD_Buffer(); AUD_NEW("buffer")
+       m_rsbuffer = new AUD_Buffer(); AUD_NEW("buffer")
+}
+
+AUD_SDLMixerReader::~AUD_SDLMixerReader()
+{
+       delete m_reader; AUD_DELETE("reader")
+       delete m_buffer; AUD_DELETE("buffer")
+       delete m_rsbuffer; AUD_DELETE("buffer")
+}
+
+bool AUD_SDLMixerReader::isSeekable()
+{
+       return m_reader->isSeekable();
+}
+
+void AUD_SDLMixerReader::seek(int position)
+{
+       m_reader->seek(position * m_ssize / m_tsize);
+       m_eor = false;
+}
+
+int AUD_SDLMixerReader::getLength()
+{
+       return m_reader->getLength() * m_tsize / m_ssize;
+}
+
+int AUD_SDLMixerReader::getPosition()
+{
+       return m_reader->getPosition() * m_tsize / m_ssize;
+}
+
+AUD_Specs AUD_SDLMixerReader::getSpecs()
+{
+       return m_tspecs;
+}
+
+AUD_ReaderType AUD_SDLMixerReader::getType()
+{
+       return m_reader->getType();
+}
+
+bool AUD_SDLMixerReader::notify(AUD_Message &message)
+{
+       return m_reader->notify(message);
+}
+
+void AUD_SDLMixerReader::read(int & length, sample_t* & buffer)
+{
+       // sample count for the target buffer without getting a shift
+       int tns = length + m_tsize - length % m_tsize;
+       // sample count for the source buffer without getting a shift
+       int sns = tns * m_ssize / m_tsize;
+       // target sample size
+       int tss = AUD_SAMPLE_SIZE(m_tspecs);
+       // source sample size
+       int sss = AUD_SAMPLE_SIZE(m_sspecs);
+
+       // input is output buffer
+       int buf_size = AUD_MAX(tns*tss, sns*sss);
+
+       // resize if necessary
+       if(m_rsbuffer->getSize() < buf_size)
+               m_rsbuffer->resize(buf_size, true);
+
+       if(m_buffer->getSize() < length*tss)
+               m_buffer->resize(length*tss);
+
+       buffer = m_buffer->getBuffer();
+       int size;
+       int index = 0;
+       sample_t* buf;
+
+       while(index < length)
+       {
+               if(m_rsposition == m_rssize)
+               {
+                       // no more data
+                       if(m_eor)
+                               length = index;
+                       // mix
+                       else
+                       {
+                               // read from source
+                               size = sns;
+                               m_reader->read(size, buf);
+
+                               // prepare
+                               m_cvt.buf = m_rsbuffer->getBuffer();
+                               m_cvt.len = size*sss;
+                               memcpy(m_cvt.buf, buf, size*sss);
+
+                               // convert
+                               SDL_ConvertAudio(&m_cvt);
+
+                               // end of reader
+                               if(size < sns)
+                                       m_eor = true;
+
+                               m_rsposition = 0;
+                               m_rssize = size * m_tsize / m_ssize;
+                       }
+               }
+
+               // size to copy
+               size = AUD_MIN(m_rssize-m_rsposition, length-index);
+
+               // copy
+               memcpy(m_buffer->getBuffer() + index * tss,
+                          m_rsbuffer->getBuffer() + m_rsposition * tss,
+                          size*tss);
+               m_rsposition += size;
+               index += size;
+       }
+}
diff --git a/intern/audaspace/SDL/AUD_SDLMixerReader.h b/intern/audaspace/SDL/AUD_SDLMixerReader.h
new file mode 100644 (file)
index 0000000..56668d0
--- /dev/null
@@ -0,0 +1,128 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#ifndef AUD_SDLMIXERREADER
+#define AUD_SDLMIXERREADER
+
+#include "AUD_IReader.h"
+class AUD_Buffer;
+
+#include <SDL.h>
+
+/**
+ * This class mixes a sound source with help of the SDL library.
+ * Unfortunately SDL is only capable of 8 and 16 bit audio, mono and stereo, as
+ * well as resampling only 2^n sample rate relationships where n is a natural
+ * number.
+ * \warning Although SDL can only resample 2^n sample rate relationships, this
+ *          class doesn't check for compliance, so in case of other factors,
+ *          the behaviour is undefined.
+ */
+class AUD_SDLMixerReader : public AUD_IReader
+{
+private:
+       /**
+        * The reader that is being mixed.
+        */
+       AUD_IReader* m_reader;
+
+       /**
+        * The current reading position in the resampling buffer.
+        */
+       int m_rsposition;
+
+       /**
+        * The count of mixed samples in the resampling buffer.
+        */
+       int m_rssize;
+
+       /**
+        * The smallest count of source samples to get a fractionless resampling
+        * factor.
+        */
+       int m_ssize;
+
+       /**
+        * The smallest count of target samples to get a fractionless resampling
+        * factor.
+        */
+       int m_tsize;
+
+       /**
+        * The sound output buffer.
+        */
+       AUD_Buffer *m_buffer;
+
+       /**
+        * The resampling buffer.
+        */
+       AUD_Buffer *m_rsbuffer;
+
+       /**
+        * The target specification.
+        */
+       AUD_Specs m_tspecs;
+
+       /**
+        * The sample specification of the source.
+        */
+       AUD_Specs m_sspecs;
+
+       /**
+        * Saves whether the end of the source has been reached.
+        */
+       bool m_eor;
+
+       /**
+        * The SDL_AudioCVT structure used for resampling.
+        */
+       SDL_AudioCVT m_cvt;
+
+public:
+       /**
+        * Creates a resampling reader.
+        * \param reader The reader to mix.
+        * \param specs The target specification.
+        * \exception AUD_Exception Thrown if the source specification cannot be
+        *            mixed to the target specification or if the reader is
+        *            NULL.
+        */
+       AUD_SDLMixerReader(AUD_IReader* reader, AUD_Specs specs);
+       /**
+        * Destroys the reader.
+        */
+       ~AUD_SDLMixerReader();
+
+       virtual bool isSeekable();
+       virtual void seek(int position);
+       virtual int getLength();
+       virtual int getPosition();
+       virtual AUD_Specs getSpecs();
+       virtual AUD_ReaderType getType();
+       virtual bool notify(AUD_Message &message);
+       virtual void read(int & length, sample_t* & buffer);
+};
+
+#endif //AUD_SDLMIXERREADER
diff --git a/intern/audaspace/SDL/Makefile b/intern/audaspace/SDL/Makefile
new file mode 100644 (file)
index 0000000..aa21091
--- /dev/null
@@ -0,0 +1,41 @@
+#
+# $Id: Makefile 13161 2008-01-07 19:13:47Z hos $
+#
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): none yet.
+#
+# ***** END GPL LICENSE BLOCK *****
+#
+#
+
+LIBNAME = SDLaudaspace
+DIR = $(OCGDIR)/intern/$(LIBNAME)
+
+include nan_compile.mk
+
+CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
+
+CPPFLAGS += $(NAN_SDLCFLAGS)
+CPPFLAGS += -I../intern
+CPPFLAGS += -I..
+CPPFLAGS += -I.
diff --git a/intern/audaspace/SRC/AUD_SRCResampleFactory.cpp b/intern/audaspace/SRC/AUD_SRCResampleFactory.cpp
new file mode 100644 (file)
index 0000000..bcace34
--- /dev/null
@@ -0,0 +1,53 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#include "AUD_SRCResampleFactory.h"
+#include "AUD_SRCResampleReader.h"
+
+AUD_SRCResampleFactory::AUD_SRCResampleFactory(AUD_IReader* reader,
+                                                                                          AUD_Specs specs) :
+               AUD_ResampleFactory(reader, specs) {}
+
+AUD_SRCResampleFactory::AUD_SRCResampleFactory(AUD_IFactory* factory,
+                                                                                          AUD_Specs specs) :
+               AUD_ResampleFactory(factory, specs) {}
+
+AUD_SRCResampleFactory::AUD_SRCResampleFactory(AUD_Specs specs) :
+               AUD_ResampleFactory(specs) {}
+
+AUD_IReader* AUD_SRCResampleFactory::createReader()
+{
+       AUD_IReader* reader = getReader();
+
+       if(reader != 0)
+       {
+               if(reader->getSpecs().rate != m_specs.rate)
+               {
+                       reader = new AUD_SRCResampleReader(reader, m_specs);
+                       AUD_NEW("reader")
+               }
+       }
+       return reader;
+}
diff --git a/intern/audaspace/SRC/AUD_SRCResampleFactory.h b/intern/audaspace/SRC/AUD_SRCResampleFactory.h
new file mode 100644 (file)
index 0000000..c23c1d2
--- /dev/null
@@ -0,0 +1,46 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#ifndef AUD_SRCRESAMPLEFACTORY
+#define AUD_SRCRESAMPLEFACTORY
+
+#include "AUD_ResampleFactory.h"
+
+/**
+ * This factory creates a resampling reader that uses libsamplerate for
+ * resampling.
+ * \note The format of the input must be float.
+ */
+class AUD_SRCResampleFactory : public AUD_ResampleFactory
+{
+public:
+       AUD_SRCResampleFactory(AUD_IReader* reader, AUD_Specs specs);
+       AUD_SRCResampleFactory(AUD_IFactory* factory, AUD_Specs specs);
+       AUD_SRCResampleFactory(AUD_Specs specs);
+
+       virtual AUD_IReader* createReader();
+};
+
+#endif //AUD_SRCRESAMPLEFACTORY
diff --git a/intern/audaspace/SRC/AUD_SRCResampleReader.cpp b/intern/audaspace/SRC/AUD_SRCResampleReader.cpp
new file mode 100644 (file)
index 0000000..f7564d3
--- /dev/null
@@ -0,0 +1,119 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#include "AUD_SRCResampleReader.h"
+#include "AUD_Buffer.h"
+
+#include <math.h>
+#include <cstring>
+#include <stdio.h>
+
+static long src_callback(void *cb_data, float **data)
+{
+       return ((AUD_SRCResampleReader*)cb_data)->doCallback(data);
+}
+
+AUD_SRCResampleReader::AUD_SRCResampleReader(AUD_IReader* reader,
+                                                                                        AUD_Specs specs) :
+               AUD_EffectReader(reader)
+{
+       m_sspecs = reader->getSpecs();
+
+       if(m_sspecs.format != AUD_FORMAT_FLOAT32)
+       {
+               delete m_reader; AUD_DELETE("reader")
+               AUD_THROW(AUD_ERROR_READER);
+       }
+
+       m_tspecs = specs;
+       m_tspecs.channels = m_sspecs.channels;
+       m_tspecs.format = m_sspecs.format;
+       m_factor = (double)m_tspecs.rate / (double)m_sspecs.rate;
+
+       int error;
+       m_src = src_callback_new(src_callback,
+                                                        SRC_SINC_MEDIUM_QUALITY,
+                                                        m_sspecs.channels,
+                                                        &error,
+                                                        this);
+
+       if(!m_src)
+       {
+               // XXX printf("%s\n", src_strerror(error));
+               delete m_reader; AUD_DELETE("reader")
+               AUD_THROW(AUD_ERROR_READER);
+       }
+
+       m_buffer = new AUD_Buffer(); AUD_NEW("buffer")
+}
+
+AUD_SRCResampleReader::~AUD_SRCResampleReader()
+{
+       delete m_buffer; AUD_DELETE("buffer")
+
+       src_delete(m_src);
+}
+
+long AUD_SRCResampleReader::doCallback(float** data)
+{
+       int length = m_buffer->getSize() / 4 / m_tspecs.channels;
+       sample_t* buffer;
+
+       m_reader->read(length, buffer);
+
+       *data = (float*)buffer;
+       return length;
+}
+
+void AUD_SRCResampleReader::seek(int position)
+{
+       m_reader->seek(position / m_factor);
+       src_reset(m_src);
+}
+
+int AUD_SRCResampleReader::getLength()
+{
+       return m_reader->getLength() * m_factor;
+}
+
+int AUD_SRCResampleReader::getPosition()
+{
+       return m_reader->getPosition() * m_factor;
+}
+
+AUD_Specs AUD_SRCResampleReader::getSpecs()
+{
+       return m_tspecs;
+}
+
+void AUD_SRCResampleReader::read(int & length, sample_t* & buffer)
+{
+       if(m_buffer->getSize() < length * m_tspecs.channels * 4)
+               m_buffer->resize(length * m_tspecs.channels * 4);
+
+       buffer = m_buffer->getBuffer();
+
+       length = src_callback_read(m_src, m_factor, length, (float*)buffer);
+}
diff --git a/intern/audaspace/SRC/AUD_SRCResampleReader.h b/intern/audaspace/SRC/AUD_SRCResampleReader.h
new file mode 100644 (file)
index 0000000..1bacdb3
--- /dev/null
@@ -0,0 +1,102 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#ifndef AUD_SRCRESAMPLEREADER
+#define AUD_SRCRESAMPLEREADER
+
+#include "AUD_EffectReader.h"
+class AUD_Buffer;
+
+#include <samplerate.h>
+
+/**
+ * This class mixes a sound source with help of the SDL library.
+ * Unfortunately SDL is only capable of 8 and 16 bit audio, mono and stereo, as
+ * well as resampling only 2^n sample rate relationships where n is a natural
+ * number.
+ * \warning Although SDL can only resample 2^n sample rate relationships, this
+ *          class doesn't check for compliance, so in case of other factors,
+ *          the behaviour is undefined.
+ */
+class AUD_SRCResampleReader : public AUD_EffectReader
+{
+private:
+       /**
+        * The resampling factor.
+        */
+       double m_factor;
+
+       /**
+        * The sound output buffer.
+        */
+       AUD_Buffer *m_buffer;
+
+       /**
+        * The target specification.
+        */
+       AUD_Specs m_tspecs;
+
+       /**
+        * The sample specification of the source.
+        */
+       AUD_Specs m_sspecs;
+
+       /**
+        * The src state structure.
+        */
+       SRC_STATE* m_src;
+
+public:
+       /**
+        * Creates a resampling reader.
+        * \param reader The reader to mix.
+        * \param specs The target specification.
+        * \exception AUD_Exception Thrown if the source specification cannot be
+        *            mixed to the target specification or if the reader is
+        *            NULL.
+        */
+       AUD_SRCResampleReader(AUD_IReader* reader, AUD_Specs specs);
+
+       /**
+        * Destroys the reader.
+        */
+       ~AUD_SRCResampleReader();
+
+       /**
+        * The callback function for SRC.
+        * \warning Do not call!
+        * \param data The pointer to the float data.
+        * \return The count of samples in the float data.
+        */
+       long doCallback(float** data);
+
+       virtual void seek(int position);
+       virtual int getLength();
+       virtual int getPosition();
+       virtual AUD_Specs getSpecs();
+       virtual void read(int & length, sample_t* & buffer);
+};
+
+#endif //AUD_SRCRESAMPLEREADER
diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp b/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
new file mode 100644 (file)
index 0000000..5f9006b
--- /dev/null
@@ -0,0 +1,88 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#include "AUD_FFMPEGFactory.h"
+#include "AUD_FFMPEGReader.h"
+#include "AUD_Space.h"
+
+extern "C" {
+#include <libavformat/avformat.h>
+}
+
+AUD_FFMPEGFactory::AUD_FFMPEGFactory(const char* filename)
+{
+       if(filename != 0)
+       {
+               m_filename = new char[strlen(filename)+1]; AUD_NEW("string")
+               strcpy(m_filename, filename);
+       }
+       else
+               m_filename = 0;
+       m_buffer = 0;
+       m_size = 0;
+}
+
+AUD_FFMPEGFactory::AUD_FFMPEGFactory(unsigned char* buffer, int size)
+{
+       m_filename = 0;
+       m_buffer = (unsigned char*)av_malloc(size); AUD_NEW("buffer")
+       m_size = size;
+       memcpy(m_buffer, buffer, size);
+}
+
+AUD_FFMPEGFactory::~AUD_FFMPEGFactory()
+{
+       if(m_filename)
+       {
+               delete[] m_filename; AUD_DELETE("string")
+       }
+       if(m_buffer)
+       {
+               av_free(m_buffer); AUD_DELETE("buffer")
+       }
+}
+
+AUD_IReader* AUD_FFMPEGFactory::createReader()
+{
+       try
+       {
+               AUD_IReader* reader;
+               if(m_filename)
+                       reader = new AUD_FFMPEGReader(m_filename);
+               else
+                       reader = new AUD_FFMPEGReader(m_buffer, m_size);
+               AUD_NEW("reader")
+               return reader;
+       }
+       catch(AUD_Exception e)
+       {
+               // return 0 if ffmpeg cannot read the file
+               if(e.error == AUD_ERROR_FFMPEG)
+                       return 0;
+               // but throw an exception if the file doesn't exist
+               else
+                       throw;
+       }
+}
diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h b/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h
new file mode 100644 (file)
index 0000000..0a9fcc2
--- /dev/null
@@ -0,0 +1,76 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#ifndef AUD_FFMPEGFACTORY
+#define AUD_FFMPEGFACTORY
+
+#include "AUD_IFactory.h"
+
+/**
+ * This factory reads a sound file via ffmpeg.
+ * \warning Notice that the needed formats and codecs have to be registered
+ * for ffmpeg before this class can be used.
+ */
+class AUD_FFMPEGFactory : public AUD_IFactory
+{
+private:
+       /**
+        * The filename of the sound source file.
+        */
+       char* m_filename;
+
+       /**
+        * The buffer to read from.
+        */
+       unsigned char* m_buffer;
+
+       /**
+        * The size of the buffer.
+        */
+       int m_size;
+
+public:
+       /**
+        * Creates a new factory.
+        * \param filename The sound file path.
+        */
+       AUD_FFMPEGFactory(const char* filename);
+
+       /**
+        * Creates a new factory.
+        * \param buffer The buffer to read from.
+        * \param size The size of the buffer.
+        */
+       AUD_FFMPEGFactory(unsigned char* buffer, int size);
+
+       /**
+        * Destroys the factory.
+        */
+       ~AUD_FFMPEGFactory();
+
+       virtual AUD_IReader* createReader();
+};
+
+#endif //AUD_FFMPEGFACTORY
diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
new file mode 100644 (file)
index 0000000..28356e3
--- /dev/null
@@ -0,0 +1,388 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+// needed for INT64_C
+#define __STDC_CONSTANT_MACROS
+
+#include "AUD_FFMPEGReader.h"
+#include "AUD_Buffer.h"
+
+extern "C" {
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
+}
+
+// This function transforms a FFMPEG SampleFormat to or own sample format
+static inline AUD_SampleFormat FFMPEG_TO_AUD(SampleFormat fmt)
+{
+       switch(fmt)
+       {
+       case SAMPLE_FMT_U8:
+               return AUD_FORMAT_U8;
+       case SAMPLE_FMT_S16:
+               return AUD_FORMAT_S16;
+       case SAMPLE_FMT_S32:
+               return AUD_FORMAT_S32;
+       case SAMPLE_FMT_FLT:
+               return AUD_FORMAT_FLOAT32;
+       case SAMPLE_FMT_DBL:
+               return AUD_FORMAT_FLOAT64;
+       default:
+               return AUD_FORMAT_INVALID;
+       }
+}
+
+int AUD_FFMPEGReader::decode(AVPacket* packet, AUD_Buffer* buffer)
+{
+       // save packet parameters
+       uint8_t *audio_pkg_data = packet->data;
+       int audio_pkg_size = packet->size;
+
+       int buf_size = buffer->getSize();
+       int buf_pos = 0;
+
+       int read_length, data_size;
+
+       // as long as there is still data in the package
+       while(audio_pkg_size > 0)
+       {
+               // resize buffer if needed
+               if(buf_size - buf_pos < AVCODEC_MAX_AUDIO_FRAME_SIZE)
+               {
+                       buffer->resize(buf_size + AVCODEC_MAX_AUDIO_FRAME_SIZE, true);
+                       buf_size += AVCODEC_MAX_AUDIO_FRAME_SIZE;
+               }
+
+               // read samples from the packet
+               data_size = buf_size - buf_pos;
+               /*read_length = avcodec_decode_audio3(m_codecCtx,
+                       (int16_t*)(buffer->getBuffer()+buf_pos),
+                       &data_size,
+                       packet);*/
+               read_length = avcodec_decode_audio2(m_codecCtx,
+                       (int16_t*)(buffer->getBuffer()+buf_pos),
+                       &data_size,
+                       audio_pkg_data,
+                       audio_pkg_size);
+
+               buf_pos += data_size;
+
+               // read error, next packet!
+               if(read_length < 0)
+                       break;
+
+               // move packet parameters
+               audio_pkg_data += read_length;
+               audio_pkg_size -= read_length;
+       }
+
+       return buf_pos;
+}
+
+AUD_FFMPEGReader::AUD_FFMPEGReader(const char* filename)
+{
+       m_position = 0;
+       m_pkgbuf_left = 0;
+       m_byteiocontext = NULL;
+
+       // open file
+       if(av_open_input_file(&m_formatCtx, filename, NULL, 0, NULL)!=0)
+               AUD_THROW(AUD_ERROR_FILE);
+
+       try
+       {
+               if(av_find_stream_info(m_formatCtx)<0)
+                       AUD_THROW(AUD_ERROR_FFMPEG);
+
+               // find audio stream and codec
+               m_stream = -1;
+
+               for(int i = 0; i < m_formatCtx->nb_streams; i++)
+                       if((m_formatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO)
+                               && (m_stream < 0))
+                       {
+                               m_stream=i;
+                               break;
+                       }
+               if(m_stream == -1)
+                       AUD_THROW(AUD_ERROR_FFMPEG);
+
+               m_codecCtx = m_formatCtx->streams[m_stream]->codec;
+
+               // get a decoder and open it
+               AVCodec *aCodec = avcodec_find_decoder(m_codecCtx->codec_id);
+               if(!aCodec)
+                       AUD_THROW(AUD_ERROR_FFMPEG);
+
+               if(avcodec_open(m_codecCtx, aCodec)<0)
+                       AUD_THROW(AUD_ERROR_FFMPEG);
+
+               // XXX this prints file information to stdout:
+               //dump_format(m_formatCtx, 0, filename, 0);
+
+               m_specs.channels = (AUD_Channels) m_codecCtx->channels;
+               m_specs.format = FFMPEG_TO_AUD(m_codecCtx->sample_fmt);
+               m_specs.rate = (AUD_SampleRate) m_codecCtx->sample_rate;
+       }
+       catch(AUD_Exception e)
+       {
+               av_close_input_file(m_formatCtx);
+               throw;
+       }
+
+       // last but not least if there hasn't been any error, create the buffers
+       m_buffer = new AUD_Buffer(); AUD_NEW("buffer")
+       m_pkgbuf = new AUD_Buffer(AVCODEC_MAX_AUDIO_FRAME_SIZE<<1);
+       AUD_NEW("buffer")
+}
+
+AUD_FFMPEGReader::AUD_FFMPEGReader(unsigned char* buffer, int size)
+{
+       m_position = 0;
+       m_pkgbuf_left = 0;
+       m_byteiocontext = (ByteIOContext*)av_mallocz(sizeof(ByteIOContext));
+       AUD_NEW("byteiocontext")
+
+       if(init_put_byte(m_byteiocontext, buffer, size, 0,
+                                        NULL, NULL, NULL, NULL) != 0)
+               AUD_THROW(AUD_ERROR_FILE);
+
+       AVProbeData probe_data;
+       probe_data.filename = "";
+       probe_data.buf = buffer;
+       probe_data.buf_size = size;
+       AVInputFormat* fmt = av_probe_input_format(&probe_data, 1);
+
+       // open stream
+       if(av_open_input_stream(&m_formatCtx, m_byteiocontext, "", fmt, NULL)!=0)
+               AUD_THROW(AUD_ERROR_FILE);
+
+       try
+       {
+               if(av_find_stream_info(m_formatCtx)<0)
+                       AUD_THROW(AUD_ERROR_FFMPEG);
+
+               // find audio stream and codec
+               m_stream = -1;
+
+               for(int i = 0; i < m_formatCtx->nb_streams; i++)
+                       if((m_formatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO)
+                               && (m_stream < 0))
+                       {
+                               m_stream=i;
+                               break;
+                       }
+               if(m_stream == -1)
+                       AUD_THROW(AUD_ERROR_FFMPEG);
+
+               m_codecCtx = m_formatCtx->streams[m_stream]->codec;
+
+               // get a decoder and open it
+               AVCodec *aCodec = avcodec_find_decoder(m_codecCtx->codec_id);
+               if(!aCodec)
+                       AUD_THROW(AUD_ERROR_FFMPEG);
+
+               if(avcodec_open(m_codecCtx, aCodec)<0)
+                       AUD_THROW(AUD_ERROR_FFMPEG);
+
+               // XXX this prints stream information to stdout:
+               //dump_format(m_formatCtx, 0, NULL, 0);
+
+               m_specs.channels = (AUD_Channels) m_codecCtx->channels;
+               m_specs.format = FFMPEG_TO_AUD(m_codecCtx->sample_fmt);
+               m_specs.rate = (AUD_SampleRate) m_codecCtx->sample_rate;
+       }
+       catch(AUD_Exception e)
+       {
+               av_close_input_stream(m_formatCtx);
+               av_free(m_byteiocontext); AUD_DELETE("byteiocontext")
+               throw;
+       }
+
+       // last but not least if there hasn't been any error, create the buffers
+       m_buffer = new AUD_Buffer(); AUD_NEW("buffer")
+       m_pkgbuf = new AUD_Buffer(AVCODEC_MAX_AUDIO_FRAME_SIZE<<1);
+       AUD_NEW("buffer")
+}
+
+AUD_FFMPEGReader::~AUD_FFMPEGReader()
+{
+       avcodec_close(m_codecCtx);
+
+       if(m_byteiocontext)
+       {
+               av_close_input_stream(m_formatCtx);
+               av_free(m_byteiocontext); AUD_DELETE("byteiocontext")
+       }
+       else
+               av_close_input_file(m_formatCtx);
+
+       delete m_buffer; AUD_DELETE("buffer")
+       delete m_pkgbuf; AUD_DELETE("buffer")
+}
+
+bool AUD_FFMPEGReader::isSeekable()
+{
+       return true;
+}
+
+void AUD_FFMPEGReader::seek(int position)
+{
+       if(position >= 0)
+       {
+               // a value < 0 tells us that seeking failed
+               if(av_seek_frame(m_formatCtx,
+                                                -1,
+                                                (uint64_t)(((uint64_t)position *
+                                                                        (uint64_t)AV_TIME_BASE) /
+                                                                       (uint64_t)m_specs.rate),
+                                                AVSEEK_FLAG_BACKWARD | AVSEEK_FLAG_ANY) >= 0)
+               {
+                       avcodec_flush_buffers(m_codecCtx);
+                       m_position = position;
+
+                       AVPacket packet;
+                       bool search = true;
+
+                       while(search && av_read_frame(m_formatCtx, &packet) >= 0)
+                       {
+                               // is it a frame from the audio stream?
+                               if(packet.stream_index == m_stream)
+                               {
+                                       // decode the package
+                                       m_pkgbuf_left = decode(&packet, m_pkgbuf);
+                                       search = false;
+
+                                       // check position
+                                       if(packet.pts != AV_NOPTS_VALUE)
+                                       {
+                                               // calculate real position, and read to frame!
+                                               m_position = packet.pts *
+                                                       av_q2d(m_formatCtx->streams[m_stream]->time_base) *
+                                                       m_specs.rate;
+
+                                               if(m_position < position)
+                                               {
+                                                       sample_t* buf;
+                                                       int length = position - m_position;
+                                                       read(length, buf);
+                                               }
+                                       }
+                               }
+                               av_free_packet(&packet);
+                       }
+               }
+               else
+               {
+                       // Seeking failed, do nothing.
+               }
+       }
+}
+
+int AUD_FFMPEGReader::getLength()
+{
+       // return approximated remaning size
+       return (int)((m_formatCtx->duration * m_codecCtx->sample_rate)
+                                / AV_TIME_BASE)-m_position;
+}
+
+int AUD_FFMPEGReader::getPosition()
+{
+       return m_position;
+}
+
+AUD_Specs AUD_FFMPEGReader::getSpecs()
+{
+       return m_specs;
+}
+
+AUD_ReaderType AUD_FFMPEGReader::getType()
+{
+       return AUD_TYPE_STREAM;
+}
+
+bool AUD_FFMPEGReader::notify(AUD_Message &message)
+{
+       return false;
+}
+
+void AUD_FFMPEGReader::read(int & length, sample_t* & buffer)
+{
+       // read packages and decode them
+       AVPacket packet;
+       int data_size = 0;
+       int pkgbuf_size = m_pkgbuf->getSize();
+       int pkgbuf_pos;
+       int left = length;
+       int sample_size = AUD_SAMPLE_SIZE(m_specs);
+
+       // resize output buffer if necessary
+       if(m_buffer->getSize() < length*sample_size)
+               m_buffer->resize(length*sample_size);
+
+       buffer = m_buffer->getBuffer();
+       pkgbuf_pos = m_pkgbuf_left;
+       m_pkgbuf_left = 0;
+
+       // there may still be data in the buffer from the last call
+       if(pkgbuf_pos > 0)
+       {
+               data_size = AUD_MIN(pkgbuf_pos, left * sample_size);
+               memcpy(buffer, m_pkgbuf->getBuffer(), data_size);
+               buffer += data_size;
+               left -= data_size/sample_size;
+     &nbs