diff --git a/Source/OpenTK/OpenAL/EfxFunctions.cs b/Source/OpenTK/OpenAL/EfxFunctions.cs index 6ac5c4e3..ed752952 100644 --- a/Source/OpenTK/OpenAL/EfxFunctions.cs +++ b/Source/OpenTK/OpenAL/EfxFunctions.cs @@ -14,9 +14,7 @@ namespace OpenTK.OpenAL { public partial class Efx { - //Effect object functions. - /* Create Effect objects. */ // typedef void (__cdecl *LPALGENEFFECTS)( ALsizei n, ALuint* effects ); @@ -32,25 +30,29 @@ namespace OpenTK.OpenAL /* Set an integer parameter for an Effect object. */ // typedef void (__cdecl *LPALEFFECTI)( ALuint eid, ALenum param, ALint value); - private delegate void DelegateAlEffecti( uint eid, EfxEffecti param, int value); - // typedef void (__cdecl *LPALEFFECTIV)( ALuint eid, ALenum param, ALint* values ); + private delegate void DelegateAlEffecti(uint eid, EfxEffecti param, int value); + /* Set a floating point parameter for an Effect object. */ // typedef void (__cdecl *LPALEFFECTF)( ALuint eid, ALenum param, ALfloat value); - private delegate void DelegateAlEffectf( uint eid, EfxEffectf param, float value); - // typedef void (__cdecl *LPALEFFECTFV)( ALuint eid, ALenum param, ALfloat* values ); + private delegate void DelegateAlEffectf(uint eid, EfxEffectf param, float value); + /* Get an integer parameter for an Effect object. */ // typedef void (__cdecl *LPALGETEFFECTI)( ALuint eid, ALenum pname, ALint* value ); - // typedef void (__cdecl *LPALGETEFFECTIV)( ALuint eid, ALenum pname, ALint* values ); + /* Get a floating point parameter for an Effect object. */ // typedef void (__cdecl *LPALGETEFFECTF)( ALuint eid, ALenum pname, ALfloat* value ); - // typedef void (__cdecl *LPALGETEFFECTFV)( ALuint eid, ALenum pname, ALfloat* values ); + + // Not used: typedef void (__cdecl *LPALEFFECTIV)( ALuint eid, ALenum param, ALint* values ); + // Not used: typedef void (__cdecl *LPALEFFECTFV)( ALuint eid, ALenum param, ALfloat* values ); + // Not used: typedef void (__cdecl *LPALGETEFFECTIV)( ALuint eid, ALenum pname, ALint* values ); + // Not used: typedef void (__cdecl *LPALGETEFFECTFV)( ALuint eid, ALenum pname, ALfloat* values ); // Filter object functions - + /* Create Filter objects. */ // typedef void (__cdecl *LPALGENFILTERS)( ALsizei n, ALuint* filters ); diff --git a/Source/OpenTK/OpenAL/EfxTokens.cs b/Source/OpenTK/OpenAL/EfxTokens.cs index e8b0015f..861d9364 100644 --- a/Source/OpenTK/OpenAL/EfxTokens.cs +++ b/Source/OpenTK/OpenAL/EfxTokens.cs @@ -36,53 +36,63 @@ namespace OpenTK.OpenAL // AL_FREQUENCY_SHIFTER_DIRECTION_UP 1 // AL_FREQUENCY_SHIFTER_DIRECTION_OFF 2 - const string ALC_EXT_EFX_NAME = "ALC_EXT_EFX"; + private const string ALC_EXT_EFX_NAME = "ALC_EXT_EFX"; /** * Context definitions to be used with alcCreateContext. * These values must be unique and not conflict with other * al context values. */ - public enum a : int + public enum NEWALCTOKENS : int { + /// This Context property can be used by the application to retrieve the Major version number of the Effects Extension supported by this OpenAL implementation. As this is a Context property is should be retrieved using alcGetIntegerv. ALC_EFX_MAJOR_VERSION = 0x20001, - ALC_EFX_MINOR_VERSION = 0x20002, - ALC_MAX_AUXILIARY_SENDS = 0x20003, + /// This Context property can be used by the application to retrieve the Minor version number of the Effects Extension supported by this OpenAL implementation. As this is a Context property is should be retrieved using alcGetIntegerv. + ALC_EFX_MINOR_VERSION = 0x20002, + + /// This Context property can be passed to OpenAL during Context creation (alcCreateContext) to request a maximum number of Auxiliary Sends desired on each Source. It is not guaranteed that the desired number of sends will be available, so an application should query this property after creating the context using alcGetIntergerv. Default: 2 + ALC_MAX_AUXILIARY_SENDS = 0x20003, + } + + public enum NEWLISTENERTOKENS : int + { /* Listener definitions to be used with alListener functions. * These values must be unique and not conflict with other * al listener values.*/ - ///Range [float.MinValue .. float.MaxValue] Default: 1.0f + ///The Listener property allows an application to specify the relationship between the units passed to OpenAL calls such as positions, velocities, reference distance, etc … and the real-world. This information is critical if Air Absorption effects are enabled because the amount of Air Absorption applied is directly related to the real-world distance between the Source and the Listener. If the application is using centimeters for distance units, then this property should be set to 0.01 so that the amount of air absorption applied is not 100 times too great! Range [float.MinValue .. float.MaxValue] Default: 1.0f AL_METERS_PER_UNIT = 0x20004, + } - + public enum NEWSSOURCETOKENS : int + { /** * Source definitions to be used with alSource functions. * These values must be unique and not conflict with other * al source values. */ - ///Range [ .. ] Default: + ///This Source property is used to apply filtering on the direct-path (dry signal) of a Source. AL_DIRECT_FILTER = 0x20005, - ///Range [ .. ] Default: - AL_AUXILIARY_SEND_FILTER = 0x20006, + ///This Source property is used to establish connections between Sources and Auxiliary Effect Slots. For a Source to feed an Effect that has been loaded into an Auxiliary Effect Slot the application must configure one of the Source’s auxiliary sends. This process involves setting 3 variables – the destination Auxiliary Effect Slot ID, the Auxiliary Send number, and an optional Filter ID. + AL_AUXILIARY_SEND_FILTER = 0x20006, // Sourcei3 - ///Range [0.0f .. 10.0f] Default: 0.0f + ///This Source property is a multiplier on the amount of Air Absorption applied to the Source. The AL_AIR_ABSORPTION_FACTOR is multiplied by an internal Air Absorption Gain HF value of 0.994 (-0.05dB) per meter which represents normal atmospheric humidity and temperature. Range [0.0f .. 10.0f] Default: 0.0f AL_AIR_ABSORPTION_FACTOR = 0x20007, - ///Range [0.0f .. 10.0f] Default: 0.0f + ///This Source property is defined the same way as the Reverb Room Rolloff property: it is one of two methods available in the Effect Extension to attenuate the reflected sound (early reflections and reverberation) according to source-listener distance. Range [0.0f .. 10.0f] Default: 0.0f AL_ROOM_ROLLOFF_FACTOR = 0x20008, - ///Range [0.0f .. 1.0f] Default: 1.0f + ///This Source property enhances the directivity for individual Sources. A directed Source points in a specified direction. The Source sounds at full volume when the listener is directly in front of the source; it is attenuated as the listener circles the Source away from the front. Range [0.0f .. 1.0f] Default: 1.0f AL_CONE_OUTER_GAINHF = 0x20009, - ///Range [AL_FALSE .. AL_TRUE] Default: AL_TRUE + ///If this Source property is set to AL_TRUE (its default value), this Source’s direct-path is automatically filtered according to the orientation of the source relative to the listener and the setting of the Source property AL_CONE_OUTER_GAINHF. Range [AL_FALSE .. AL_TRUE] Default: AL_TRUE AL_DIRECT_FILTER_GAINHF_AUTO = 0x2000A, - ///Range [AL_FALSE .. AL_TRUE] Default: AL_TRUE + ///If this Source property is set to AL_TRUE (its default value), the intensity of this Source’s reflected sound is automatically attenuated according to source-listener distance and source directivity (as determined by the cone parameters). If it is AL_FALSE, the reflected sound is not attenuated according to distance and directivity. Range [AL_FALSE .. AL_TRUE] Default: AL_TRUE AL_AUXILIARY_SEND_FILTER_GAIN_AUTO = 0x2000B, - ///Range [AL_FALSE .. AL_TRUE] Default: AL_TRUE + ///If this Source property is AL_TRUE (its default value), the intensity of this Source’s reflected sound at high frequencies will be automatically attenuated according to the high-frequency source directivity as set by the AL_CONE_OUTER_GAINHF property. If this property is AL_FALSE, the Source’s reflected sound is not filtered at all according to the Source’s directivity. Range [AL_FALSE .. AL_TRUE] Default: AL_TRUE AL_AUXILIARY_SEND_FILTER_GAINHF_AUTO = 0x2000C, } - #region Effect object definitions to be used with alEffect functions. + #region Effect public enum EfxEffectf : int { @@ -110,16 +120,7 @@ namespace OpenTK.OpenAL AL_REVERB_AIR_ABSORPTION_GAINHF = 0x000B, ///Reverb Parameter. Range [0.0f .. 10.0f] Default: 0.0f AL_REVERB_ROOM_ROLLOFF_FACTOR = 0x000C, - ///Reverb Parameter. Range [AL_FALSE .. AL_TRUE] Default: AL_TRUE - AL_REVERB_DECAY_HFLIMIT = 0x000D, - } - public enum AL_EFFECT_CHORUS : int - { - ///Chorus Parameter. Unit: (0) Sinusoid, (1) Triangle [0 .. 1] Default: 1 - AL_CHORUS_WAVEFORM = 0x0001, - ///Chorus Parameter. Unit: Degrees Range [-180 .. 180] Default: 90 - AL_CHORUS_PHASE = 0x0002, ///Chorus Parameter. Unit: Hz Range [0.0f .. 10.0f] Default: 1.1f AL_CHORUS_RATE = 0x0003, ///Chorus Parameter. Range [0.0f .. 1.0f] Default: 0.1f @@ -128,10 +129,7 @@ namespace OpenTK.OpenAL AL_CHORUS_FEEDBACK = 0x0005, ///Chorus Parameter. Unit: Seconds Range [0.0f .. 0.016f] Default: 0.016f AL_CHORUS_DELAY = 0x0006, - } - public enum AL_EFFECT_DISTORTION : int - { ///Distortion Parameter. Range [0.0f .. 1.0f] Default: 0.2f AL_DISTORTION_EDGE = 0x0001, ///Distortion Parameter. Range [0.01f .. 1.0f] Default: 0.05f @@ -142,10 +140,7 @@ namespace OpenTK.OpenAL AL_DISTORTION_EQCENTER = 0x0004, ///Distortion Parameter. Unit: Hz Range [80.0f .. 24000.0f] Default: 3600.0f AL_DISTORTION_EQBANDWIDTH = 0x0005, - } - public enum AL_EFFECT_ECHO : int - { ///Echo Parameter. Unit: Seconds Range [0.0f .. 0.207f] Default: 0.1f AL_ECHO_DELAY = 0x0001, ///Echo Parameter. Unit: Seconds Range [0.0f .. 0.404f] Default: 0.1f @@ -156,14 +151,7 @@ namespace OpenTK.OpenAL AL_ECHO_FEEDBACK = 0x0004, ///Echo Parameter. Range [-1.0f .. +1.0f] Default: -1.0f AL_ECHO_SPREAD = 0x0005, - } - public enum AL_EFFECT_FLANGER : int - { - ///Flanger Parameter. Unit: (0) Sinusoid, (1) Triangle Range [0 .. 1] Default: 1 - AL_FLANGER_WAVEFORM = 0x0001, - ///Flanger Parameter. Range [-180 .. +180] Default: 0 - AL_FLANGER_PHASE = 0x0002, ///Flanger Parameter. Range [0.0f .. 10.0f] Default: 0.27f AL_FLANGER_RATE = 0x0003, ///Flanger Parameter. Range [0.0f .. 1.0f] Default: 1.0f @@ -172,89 +160,18 @@ namespace OpenTK.OpenAL AL_FLANGER_FEEDBACK = 0x0005, ///Flanger Parameter. Unit: Seconds Range [0.0f .. 0.004f] Default: 0.002f AL_FLANGER_DELAY = 0x0006, - } - public enum AL_EFFECT_FREQUENCY_SHIFTER : int - { ///Frequencyshifter Parameter. Unit: Hz Range [0.0f .. 24000.0f] Default: 0.0f AL_FREQUENCY_SHIFTER_FREQUENCY = 0x0001, - ///Frequencyshifter Parameter. Unit: (0) Down, (1) Up, (2) Off Range [0 .. 2] Default: 0 - AL_FREQUENCY_SHIFTER_LEFT_DIRECTION = 0x0002, - ///Frequencyshifter Parameter. Unit: (0) Down, (1) Up, (2) Off Range [0 .. 2] Default: 0 - AL_FREQUENCY_SHIFTER_RIGHT_DIRECTION = 0x0003, - } - public enum AL_EFFECT_VOCAL_MORPHER : int - { - ///Vocalmorpher Parameter. Unit: Use enum FormantFilterSettings Range [0 .. 29] Default: 0, AL_VOCAL_MORPHER_PHONEME_A - AL_VOCAL_MORPHER_PHONEMEA = 0x0001, - ///Vocalmorpher Parameter. Unit: Semitones Range [-24 .. +24] Default: 0 - AL_VOCAL_MORPHER_PHONEMEA_COARSE_TUNING = 0x0002, - ///Vocalmorpher Parameter. Unit: Use enum FormantFilterSettings Range [0 .. 29] Default: 10, AL_VOCAL_MORPHER_PHONEME_ER - AL_VOCAL_MORPHER_PHONEMEB = 0x0003, - ///Vocalmorpher Parameter. Unit: Semitones Range [-24 .. +24] Default: 0 - AL_VOCAL_MORPHER_PHONEMEB_COARSE_TUNING = 0x0004, - ///Vocalmorpher Parameter. Unit: (0) Sinusoid, (1) Triangle, (2) Sawtooth Range [0 .. 2] Default: 0 - AL_VOCAL_MORPHER_WAVEFORM = 0x0005, ///Vocalmorpher Parameter. Unit: Hz Range [0.0f .. 10.0f] Default: 1.41f AL_VOCAL_MORPHER_RATE = 0x0006, - } - // AL vocal morpher effect parameter ranges and defaults - public enum FormantFilterSettings : int - { - AL_VOCAL_MORPHER_PHONEME_A = 0, - AL_VOCAL_MORPHER_PHONEME_E = 1, - AL_VOCAL_MORPHER_PHONEME_I = 2, - AL_VOCAL_MORPHER_PHONEME_O = 3, - AL_VOCAL_MORPHER_PHONEME_U = 4, - AL_VOCAL_MORPHER_PHONEME_AA = 5, - AL_VOCAL_MORPHER_PHONEME_AE = 6, - AL_VOCAL_MORPHER_PHONEME_AH = 7, - AL_VOCAL_MORPHER_PHONEME_AO = 8, - AL_VOCAL_MORPHER_PHONEME_EH = 9, - AL_VOCAL_MORPHER_PHONEME_ER = 10, - AL_VOCAL_MORPHER_PHONEME_IH = 11, - AL_VOCAL_MORPHER_PHONEME_IY = 12, - AL_VOCAL_MORPHER_PHONEME_UH = 13, - AL_VOCAL_MORPHER_PHONEME_UW = 14, - AL_VOCAL_MORPHER_PHONEME_B = 15, - AL_VOCAL_MORPHER_PHONEME_D = 16, - AL_VOCAL_MORPHER_PHONEME_F = 17, - AL_VOCAL_MORPHER_PHONEME_G = 18, - AL_VOCAL_MORPHER_PHONEME_J = 19, - AL_VOCAL_MORPHER_PHONEME_K = 20, - AL_VOCAL_MORPHER_PHONEME_L = 21, - AL_VOCAL_MORPHER_PHONEME_M = 22, - AL_VOCAL_MORPHER_PHONEME_N = 23, - AL_VOCAL_MORPHER_PHONEME_P = 24, - AL_VOCAL_MORPHER_PHONEME_R = 25, - AL_VOCAL_MORPHER_PHONEME_S = 26, - AL_VOCAL_MORPHER_PHONEME_T = 27, - AL_VOCAL_MORPHER_PHONEME_V = 28, - AL_VOCAL_MORPHER_PHONEME_Z = 29, - } - - public enum AL_EFFECT_PITCH_SHIFTER : int - { - ///Pitchshifter Parameter. Unit: Semitones Range [-12 .. +12] Default: +12 - AL_PITCH_SHIFTER_COARSE_TUNE = 0x0001, - ///Pitchshifter Parameter. Unit: Cents Range [-50 .. +50] Default: 0 - AL_PITCH_SHIFTER_FINE_TUNE = 0x0002, - } - - public enum AL_EFFECT_RING_MODULATOR : int - { ///Ringmodulator Parameter. Unit: Hz Range [0.0f .. 8000.0f] Default: 440.0f AL_RING_MODULATOR_FREQUENCY = 0x0001, ///Ringmodulator Parameter. Unit: Hz Range [0.0f .. 24000.0f] Default: 800.0f AL_RING_MODULATOR_HIGHPASS_CUTOFF = 0x0002, - ///Ringmodulator Parameter. Unit: (0) Sinusoid, (1) Sawtooth, (2) Square Range [0 .. 2] Default: 0 - AL_RING_MODULATOR_WAVEFORM = 0x0003, - } - public enum AL_EFFECT_AUTOWAH - { ///Autowah Parameter. Unit: Seconds Range [0.0001f .. 1.0f] Default: 0.06f AL_AUTOWAH_ATTACK_TIME = 0x0001, ///Autowah Parameter. Unit: Seconds Range [0.0001f .. 1.0f] Default: 0.06f @@ -263,16 +180,7 @@ namespace OpenTK.OpenAL AL_AUTOWAH_RESONANCE = 0x0003, ///Autowah Parameter. Range [0.00003f .. 31621.0f] Default: 11.22f AL_AUTOWAH_PEAK_GAIN = 0x0004, - } - public enum AL_EFFECT_COMPRESSOR : int - { - ///Compressor Parameter. Unit: (0) Off, (1) On Range [0 .. 1] Default: 1 - AL_COMPRESSOR_ONOFF = 0x0001, - } - - public enum AL_EFFECT_EQUALIZER : int - { ///Equalizer Parameter. Range [0.126f .. 7.943f] Default: 1.0f AL_EQUALIZER_LOW_GAIN = 0x0001, ///Equalizer Parameter. Unit: Hz Range [50.0f .. 800.0f] Default: 200.0f @@ -293,10 +201,7 @@ namespace OpenTK.OpenAL AL_EQUALIZER_HIGH_GAIN = 0x0009, ///Equalizer Parameter. Unit: Hz Range [4000.0f .. 16000.0f] Default: 6000.0f AL_EQUALIZER_HIGH_CUTOFF = 0x000A, - } - public enum AL_EFFECT_EAXREVERB : int - { ///EAXReverb effect parameters. Range [0.0f .. 1.0f] Default: 1.0f AL_EAXREVERB_DENSITY = 0x0001, ///EAXReverb effect parameters. Range [0.0f .. 1.0f] Default: 1.0f @@ -341,19 +246,95 @@ namespace OpenTK.OpenAL AL_EAXREVERB_LFREFERENCE = 0x0015, ///EAXReverb effect parameters. Range [0.0f .. 10.0f] Default: 0.0f AL_EAXREVERB_ROOM_ROLLOFF_FACTOR = 0x0016, - ///EAXReverb effect parameters. Range [AL_FALSE .. AL_TRUE] Default: AL_TRUE - AL_EAXREVERB_DECAY_HFLIMIT = 0x0017, } - #endregion - public enum EfxEffecti : int { + ///Chorus Parameter. Unit: (0) Sinusoid, (1) Triangle [0 .. 1] Default: 1 + AL_CHORUS_WAVEFORM = 0x0001, + ///Chorus Parameter. Unit: Degrees Range [-180 .. 180] Default: 90 + AL_CHORUS_PHASE = 0x0002, + + ///Flanger Parameter. Unit: (0) Sinusoid, (1) Triangle Range [0 .. 1] Default: 1 + AL_FLANGER_WAVEFORM = 0x0001, + ///Flanger Parameter. Range [-180 .. +180] Default: 0 + AL_FLANGER_PHASE = 0x0002, + + ///Frequencyshifter Parameter. Unit: (0) Down, (1) Up, (2) Off Range [0 .. 2] Default: 0 + AL_FREQUENCY_SHIFTER_LEFT_DIRECTION = 0x0002, + ///Frequencyshifter Parameter. Unit: (0) Down, (1) Up, (2) Off Range [0 .. 2] Default: 0 + AL_FREQUENCY_SHIFTER_RIGHT_DIRECTION = 0x0003, + + ///Vocalmorpher Parameter. Unit: Use enum EfxFormantFilterSettings Range [0 .. 29] Default: 0, AL_VOCAL_MORPHER_PHONEME_A + AL_VOCAL_MORPHER_PHONEMEA = 0x0001, + ///Vocalmorpher Parameter. Unit: Semitones Range [-24 .. +24] Default: 0 + AL_VOCAL_MORPHER_PHONEMEA_COARSE_TUNING = 0x0002, + ///Vocalmorpher Parameter. Unit: Use enum EfxFormantFilterSettings Range [0 .. 29] Default: 10, AL_VOCAL_MORPHER_PHONEME_ER + AL_VOCAL_MORPHER_PHONEMEB = 0x0003, + ///Vocalmorpher Parameter. Unit: Semitones Range [-24 .. +24] Default: 0 + AL_VOCAL_MORPHER_PHONEMEB_COARSE_TUNING = 0x0004, + ///Vocalmorpher Parameter. Unit: (0) Sinusoid, (1) Triangle, (2) Sawtooth Range [0 .. 2] Default: 0 + AL_VOCAL_MORPHER_WAVEFORM = 0x0005, + + ///Pitchshifter Parameter. Unit: Semitones Range [-12 .. +12] Default: +12 + AL_PITCH_SHIFTER_COARSE_TUNE = 0x0001, + ///Pitchshifter Parameter. Unit: Cents Range [-50 .. +50] Default: 0 + AL_PITCH_SHIFTER_FINE_TUNE = 0x0002, + + ///Ringmodulator Parameter. Unit: (0) Sinusoid, (1) Sawtooth, (2) Square Range [0 .. 2] Default: 0 + AL_RING_MODULATOR_WAVEFORM = 0x0003, + + ///Compressor Parameter. Unit: (0) Off, (1) On Range [0 .. 1] Default: 1 + AL_COMPRESSOR_ONOFF = 0x0001, + + ///Reverb Parameter. Unit: (0) False, (1) True Range [AL_FALSE .. AL_TRUE] Default: AL_TRUE + AL_REVERB_DECAY_HFLIMIT = 0x000D, + + ///EAXReverb effect parameters. Unit: (0) False, (1) True Range [AL_FALSE .. AL_TRUE] Default: AL_TRUE + AL_EAXREVERB_DECAY_HFLIMIT = 0x0017, + AL_EFFECT_FIRST_PARAMETER = 0x0000, AL_EFFECT_LAST_PARAMETER = 0x8000, + + /// Used with the enum EfxEffectType as it's parameter. AL_EFFECT_TYPE = 0x8001, // AL.BindEffect() } + ///Vocal morpher effect parameters. + public enum EfxFormantFilterSettings : int + { + AL_VOCAL_MORPHER_PHONEME_A = 0, + AL_VOCAL_MORPHER_PHONEME_E = 1, + AL_VOCAL_MORPHER_PHONEME_I = 2, + AL_VOCAL_MORPHER_PHONEME_O = 3, + AL_VOCAL_MORPHER_PHONEME_U = 4, + AL_VOCAL_MORPHER_PHONEME_AA = 5, + AL_VOCAL_MORPHER_PHONEME_AE = 6, + AL_VOCAL_MORPHER_PHONEME_AH = 7, + AL_VOCAL_MORPHER_PHONEME_AO = 8, + AL_VOCAL_MORPHER_PHONEME_EH = 9, + AL_VOCAL_MORPHER_PHONEME_ER = 10, + AL_VOCAL_MORPHER_PHONEME_IH = 11, + AL_VOCAL_MORPHER_PHONEME_IY = 12, + AL_VOCAL_MORPHER_PHONEME_UH = 13, + AL_VOCAL_MORPHER_PHONEME_UW = 14, + AL_VOCAL_MORPHER_PHONEME_B = 15, + AL_VOCAL_MORPHER_PHONEME_D = 16, + AL_VOCAL_MORPHER_PHONEME_F = 17, + AL_VOCAL_MORPHER_PHONEME_G = 18, + AL_VOCAL_MORPHER_PHONEME_J = 19, + AL_VOCAL_MORPHER_PHONEME_K = 20, + AL_VOCAL_MORPHER_PHONEME_L = 21, + AL_VOCAL_MORPHER_PHONEME_M = 22, + AL_VOCAL_MORPHER_PHONEME_N = 23, + AL_VOCAL_MORPHER_PHONEME_P = 24, + AL_VOCAL_MORPHER_PHONEME_R = 25, + AL_VOCAL_MORPHER_PHONEME_S = 26, + AL_VOCAL_MORPHER_PHONEME_T = 27, + AL_VOCAL_MORPHER_PHONEME_V = 28, + AL_VOCAL_MORPHER_PHONEME_Z = 29, + } + ///Effect type definitions to be used with AL_EFFECT_TYPE. public enum EfxEffectType : int { @@ -374,38 +355,41 @@ namespace OpenTK.OpenAL AL_EFFECT_EAXREVERB = 0x8000, } + #endregion Effect + + #region Auxiliary Effect Slot + public enum EfxAuxiliarySlot : int { // Auxiliary Slot object definitions to be used with alAuxiliaryEffectSlot functions. + /// This property is used to attach an Effect object to the Auxiliary Effect Slot object. After the attachment, the Auxiliary Effect Slot object will contain the effect type and have the same effect parameters that were stored in the Effect object. Any Sources feeding the Auxiliary Effect Slot will immediate feed the new effect type and new effect parameters. AL_EFFECTSLOT_EFFECT = 0x0001, + /// This property is used to specify an output level for the Auxiliary Effect Slot. Setting the gain to 0.0f mutes the output. Range [0.0f .. 1.0f] Default: 1.0f AL_EFFECTSLOT_GAIN = 0x0002, + /// This property is used to enable or disable automatic send adjustments based on the physical positions of the sources and the listener. This property should be enabled when an application wishes to use a reverb effect to simulate the environment surrounding a listener or a collection of Sources. Range [False .. True] Default: True AL_EFFECTSLOT_AUXILIARY_SEND_AUTO = 0x0003, // Value to be used as an Auxiliary Slot ID to disable a source send.. AL_EFFECTSLOT_NULL = 0x0000, } + #endregion Auxiliary Effect Slot + #region Filter Object // Filter object definitions to be used with alFilter functions. - public enum EfxFilterLowpass : int + public enum EfxFilterf : int { ///Range [0.0f .. 1.0f] Default: 1.0f AL_LOWPASS_GAIN = 0x0001, ///Range [0.0f .. 1.0f] Default: 1.0f AL_LOWPASS_GAINHF = 0x0002, - } - public enum EfxFilterHighpass : int - { ///Range [0.0f .. 1.0f] Default: 1.0f AL_HIGHPASS_GAIN = 0x0001, ///Range [0.0f .. 1.0f] Default: 1.0f AL_HIGHPASS_GAINLF = 0x0002, - } - public enum EfxFilterBandpass : int - { ///Range [0.0f .. 1.0f] Default: 1.0f AL_BANDPASS_GAIN = 0x0001, ///Range [0.0f .. 1.0f] Default: 1.0f @@ -415,17 +399,16 @@ namespace OpenTK.OpenAL } // Filter type - public enum EfxFilterType : int + public enum EfxFilteri : int { AL_FILTER_FIRST_PARAMETER = 0x0000, - AL_FILTER_LAST_PARAMETER = 0x8000, + AL_FILTER_LAST_PARAMETER = 0x8000, // deprecated? AL_FILTER_TYPE = 0x8001, } // Filter type definitions to be used with AL_FILTER_TYPE. - public enum EfxFilterTypeDefinition : int + public enum EfxFilterType : int { - AL_FILTER_NULL = 0x0000, // Can also be used as a Filter Object ID AL_FILTER_LOWPASS = 0x0001, AL_FILTER_HIGHPASS = 0x0002, diff --git a/Source/OpenTK/OpenAL/History.txt b/Source/OpenTK/OpenAL/History.txt index fd4fc952..35767686 100644 --- a/Source/OpenTK/OpenAL/History.txt +++ b/Source/OpenTK/OpenAL/History.txt @@ -49,5 +49,8 @@ Version History: Next Version: - EFX Extension - Enums themselves require summaries (do EFX 1st) + +- Identify: AL_FILTER_FIRST_PARAMETER, AL_FILTER_LAST_PARAMETER + AL_EFFECT_FIRST_PARAMETER, AL_EFFECT_LAST_PARAMETER - use [MarshalAs(UnmanagedType)] attribute, instead of AL.Bool? investigate - AL.BindBuffer helper function ala GL.BindBuffer? (Wraps AL.Source, better consistency) \ No newline at end of file