[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56794] trunk/lib/windows_vc11: Reverted to OpenAL 1.1 because of 3D Sound.
Jürgen Herrmann
shadowrom at me.com
Tue May 14 13:46:27 CEST 2013
Revision: 56794
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56794
Author: shadowrom
Date: 2013-05-14 11:46:27 +0000 (Tue, 14 May 2013)
Log Message:
-----------
Reverted to OpenAL 1.1 because of 3D Sound.
Fixed compilation Error of Audaspace with Jack. (Typedefs)
Modified Paths:
--------------
trunk/lib/windows_vc11/jack/include/jack/systemdeps.h
trunk/lib/windows_vc11/jack/include/jack/types.h
trunk/lib/windows_vc11/openal/include/AL/al.h
trunk/lib/windows_vc11/openal/include/AL/alc.h
trunk/lib/windows_vc11/openal/lib/OpenAL32.dll
trunk/lib/windows_vc11/openal/lib/OpenAL32.lib
Added Paths:
-----------
trunk/lib/windows_vc11/openal/include/COPYING
trunk/lib/windows_vc11/openal/lib/wrap_oal.dll
trunk/lib/windows_vc11/openal/lib/wrap_oal.lib
Modified: trunk/lib/windows_vc11/jack/include/jack/systemdeps.h
===================================================================
--- trunk/lib/windows_vc11/jack/include/jack/systemdeps.h 2013-05-14 11:18:45 UTC (rev 56793)
+++ trunk/lib/windows_vc11/jack/include/jack/systemdeps.h 2013-05-14 11:46:27 UTC (rev 56794)
@@ -63,15 +63,15 @@
#include <windows.h>
#ifdef _MSC_VER /* Microsoft compiler */
- #define __inline__ inline
- #if (!defined(int8_t) && !defined(_STDINT_H))
+ //#define __inline__ inline
+ #if (!defined(int8_t) && !defined(_STDINT_H_))
#define __int8_t_defined
- typedef char int8_t;
+ //typedef char int8_t;
typedef unsigned char uint8_t;
typedef short int16_t;
typedef unsigned short uint16_t;
- typedef long int32_t;
- typedef unsigned long uint32_t;
+ //typedef long int32_t;
+ //typedef unsigned long uint32_t;
typedef LONGLONG int64_t;
typedef ULONGLONG uint64_t;
#endif
Modified: trunk/lib/windows_vc11/jack/include/jack/types.h
===================================================================
--- trunk/lib/windows_vc11/jack/include/jack/types.h 2013-05-14 11:18:45 UTC (rev 56793)
+++ trunk/lib/windows_vc11/jack/include/jack/types.h 2013-05-14 11:46:27 UTC (rev 56794)
@@ -23,12 +23,12 @@
#include <jack/systemdeps.h>
-typedef int32_t jack_shmsize_t;
+typedef long jack_shmsize_t;
/**
* Type used to represent sample frame counts.
*/
-typedef uint32_t jack_nframes_t;
+typedef unsigned long jack_nframes_t;
/**
* Maximum value that can be stored in jack_nframes_t
@@ -70,9 +70,9 @@
* Ports have unique ids. A port registration callback is the only
* place you ever need to know their value.
*/
-typedef uint32_t jack_port_id_t;
+typedef unsigned long jack_port_id_t;
-typedef uint32_t jack_port_type_id_t;
+typedef unsigned long jack_port_type_id_t;
/**
* @ref jack_options_t bits
@@ -561,9 +561,9 @@
jack_position_bits_t valid; /**< which other fields are valid */
/* JackPositionBBT fields: */
- int32_t bar; /**< current bar */
- int32_t beat; /**< current beat-within-bar */
- int32_t tick; /**< current tick-within-beat */
+ long bar; /**< current bar */
+ long beat; /**< current beat-within-bar */
+ long tick; /**< current tick-within-beat */
double bar_start_tick;
float beats_per_bar; /**< time signature "numerator" */
@@ -611,7 +611,7 @@
/* For binary compatibility, new fields should be allocated from
* this padding area with new valid bits controlling access, so
* the existing structure size and offsets are preserved. */
- int32_t padding[7];
+ long padding[7];
/* When (unique_1 == unique_2) the contents are consistent. */
jack_unique_t unique_2; /**< unique ID */
Modified: trunk/lib/windows_vc11/openal/include/AL/al.h
===================================================================
--- trunk/lib/windows_vc11/openal/include/AL/al.h 2013-05-14 11:18:45 UTC (rev 56793)
+++ trunk/lib/windows_vc11/openal/include/AL/al.h 2013-05-14 11:46:27 UTC (rev 56794)
@@ -1,656 +1,724 @@
-#ifndef AL_AL_H
-#define AL_AL_H
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-#ifndef AL_API
- #if defined(AL_LIBTYPE_STATIC)
- #define AL_API
- #elif defined(_WIN32)
- #define AL_API __declspec(dllimport)
- #else
- #define AL_API extern
- #endif
-#endif
-
-#if defined(_WIN32)
- #define AL_APIENTRY __cdecl
-#else
- #define AL_APIENTRY
-#endif
-
-
-/** Deprecated macro. */
-#define OPENAL
-#define ALAPI AL_API
-#define ALAPIENTRY AL_APIENTRY
-#define AL_INVALID (-1)
-#define AL_ILLEGAL_ENUM AL_INVALID_ENUM
-#define AL_ILLEGAL_COMMAND AL_INVALID_OPERATION
-
-/** Supported AL version. */
-#define AL_VERSION_1_0
-#define AL_VERSION_1_1
-
-/** 8-bit boolean */
-typedef char ALboolean;
-
-/** character */
-typedef char ALchar;
-
-/** signed 8-bit 2's complement integer */
-typedef signed char ALbyte;
-
-/** unsigned 8-bit integer */
-typedef unsigned char ALubyte;
-
-/** signed 16-bit 2's complement integer */
-typedef short ALshort;
-
-/** unsigned 16-bit integer */
-typedef unsigned short ALushort;
-
-/** signed 32-bit 2's complement integer */
-typedef int ALint;
-
-/** unsigned 32-bit integer */
-typedef unsigned int ALuint;
-
-/** non-negative 32-bit binary integer size */
-typedef int ALsizei;
-
-/** enumerated 32-bit value */
-typedef int ALenum;
-
-/** 32-bit IEEE754 floating-point */
-typedef float ALfloat;
-
-/** 64-bit IEEE754 floating-point */
-typedef double ALdouble;
-
-/** void type (for opaque pointers only) */
-typedef void ALvoid;
-
-
-/* Enumerant values begin at column 50. No tabs. */
-
-/** "no distance model" or "no buffer" */
-#define AL_NONE 0
-
-/** Boolean False. */
-#define AL_FALSE 0
-
-/** Boolean True. */
-#define AL_TRUE 1
-
-
-/**
- * Relative source.
- * Type: ALboolean
- * Range: [AL_TRUE, AL_FALSE]
- * Default: AL_FALSE
- *
- * Specifies if the Source has relative coordinates.
- */
-#define AL_SOURCE_RELATIVE 0x202
-
-
-/**
- * Inner cone angle, in degrees.
- * Type: ALint, ALfloat
- * Range: [0 - 360]
- * Default: 360
- *
- * The angle covered by the inner cone, where the source will not attenuate.
- */
-#define AL_CONE_INNER_ANGLE 0x1001
-
-/**
- * Outer cone angle, in degrees.
- * Range: [0 - 360]
- * Default: 360
- *
- * The angle covered by the outer cone, where the source will be fully
- * attenuated.
- */
-#define AL_CONE_OUTER_ANGLE 0x1002
-
-/**
- * Source pitch.
- * Type: ALfloat
- * Range: [0.5 - 2.0]
- * Default: 1.0
- *
- * A multiplier for the frequency (sample rate) of the source's buffer.
- */
-#define AL_PITCH 0x1003
-
-/**
- * Source or listener position.
- * Type: ALfloat[3], ALint[3]
- * Default: {0, 0, 0}
- *
- * The source or listener location in three dimensional space.
- *
- * OpenAL, like OpenGL, uses a right handed coordinate system, where in a
- * frontal default view X (thumb) points right, Y points up (index finger), and
- * Z points towards the viewer/camera (middle finger).
- *
- * To switch from a left handed coordinate system, flip the sign on the Z
- * coordinate.
- */
-#define AL_POSITION 0x1004
-
-/**
- * Source direction.
- * Type: ALfloat[3], ALint[3]
- * Default: {0, 0, 0}
- *
- * Specifies the current direction in local space.
- * A zero-length vector specifies an omni-directional source (cone is ignored).
- */
-#define AL_DIRECTION 0x1005
-
-/**
- * Source or listener velocity.
- * Type: ALfloat[3], ALint[3]
- * Default: {0, 0, 0}
- *
- * Specifies the current velocity in local space.
- */
-#define AL_VELOCITY 0x1006
-
-/**
- * Source looping.
- * Type: ALboolean
- * Range: [AL_TRUE, AL_FALSE]
- * Default: AL_FALSE
- *
- * Specifies whether source is looping.
- */
-#define AL_LOOPING 0x1007
-
-/**
- * Source buffer.
- * Type: ALuint
- * Range: any valid Buffer.
- *
- * Specifies the buffer to provide sound samples.
- */
-#define AL_BUFFER 0x1009
-
-/**
- * Source or listener gain.
- * Type: ALfloat
- * Range: [0.0 - ]
- *
- * A value of 1.0 means unattenuated. Each division by 2 equals an attenuation
- * of about -6dB. Each multiplicaton by 2 equals an amplification of about
- * +6dB.
- *
- * A value of 0.0 is meaningless with respect to a logarithmic scale; it is
- * silent.
- */
-#define AL_GAIN 0x100A
-
-/**
- * Minimum source gain.
- * Type: ALfloat
- * Range: [0.0 - 1.0]
- *
- * The minimum gain allowed for a source, after distance and cone attenation is
- * applied (if applicable).
- */
-#define AL_MIN_GAIN 0x100D
-
-/**
- * Maximum source gain.
- * Type: ALfloat
- * Range: [0.0 - 1.0]
- *
- * The maximum gain allowed for a source, after distance and cone attenation is
- * applied (if applicable).
- */
-#define AL_MAX_GAIN 0x100E
-
-/**
- * Listener orientation.
- * Type: ALfloat[6]
- * Default: {0.0, 0.0, -1.0, 0.0, 1.0, 0.0}
- *
- * Effectively two three dimensional vectors. The first vector is the front (or
- * "at") and the second is the top (or "up").
- *
- * Both vectors are in local space.
- */
-#define AL_ORIENTATION 0x100F
-
-/**
- * Source state (query only).
- * Type: ALint
- * Range: [AL_INITIAL, AL_PLAYING, AL_PAUSED, AL_STOPPED]
- */
-#define AL_SOURCE_STATE 0x1010
-
-/** Source state value. */
-#define AL_INITIAL 0x1011
-#define AL_PLAYING 0x1012
-#define AL_PAUSED 0x1013
-#define AL_STOPPED 0x1014
-
-/**
- * Source Buffer Queue size (query only).
- * Type: ALint
- *
- * The number of buffers queued using alSourceQueueBuffers, minus the buffers
- * removed with alSourceUnqueueBuffers.
- */
-#define AL_BUFFERS_QUEUED 0x1015
-
-/**
- * Source Buffer Queue processed count (query only).
- * Type: ALint
- *
- * The number of queued buffers that have been fully processed, and can be
- * removed with alSourceUnqueueBuffers.
- *
- * Looping sources will never fully process buffers because they will be set to
- * play again for when the source loops.
- */
-#define AL_BUFFERS_PROCESSED 0x1016
-
-/**
- * Source reference distance.
- * Type: ALfloat
- * Range: [0.0 - ]
- * Default: 1.0
- *
- * The distance in units that no attenuation occurs.
- *
- * At 0.0, no distance attenuation ever occurs on non-linear attenuation models.
- */
-#define AL_REFERENCE_DISTANCE 0x1020
-
-/**
- * Source rolloff factor.
- * Type: ALfloat
- * Range: [0.0 - ]
- * Default: 1.0
- *
- * Multiplier to exaggerate or diminish distance attenuation.
- *
- * At 0.0, no distance attenuation ever occurs.
- */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list