fmod: headers diff between 42806 and 43005 versions

	fmod.h	fmod.h

	skipping to change at line 19	skipping to change at line 19
	/* ======================================================================== ==================== */	/* ======================================================================== ==================== */

	#ifndef _FMOD_H	#ifndef _FMOD_H
	#define _FMOD_H	#define _FMOD_H

	/*	/*
	FMOD version number. Check this against FMOD::System::getVersion.	FMOD version number. Check this against FMOD::System::getVersion.
	0xaaaabbcc -> aaaa = major version number. bb = minor version number. cc = development version number.	0xaaaabbcc -> aaaa = major version number. bb = minor version number. cc = development version number.
	*/	*/


	#define FMOD_VERSION 0x00042806	#define FMOD_VERSION 0x00043005

	/*	/*
	Compiler specific settings.	Compiler specific settings.
	*/	*/

	#if defined(__CYGWIN32__)	#if defined(__CYGWIN32__)
	#define F_CDECL __cdecl	#define F_CDECL __cdecl
	#define F_STDCALL __stdcall	#define F_STDCALL __stdcall
	#define F_DECLSPEC __declspec	#define F_DECLSPEC __declspec
	#define F_DLLEXPORT ( dllexport )	#define F_DLLEXPORT ( dllexport )

	skipping to change at line 261	skipping to change at line 261
	FMOD_ERR_EVENT_INTERNAL, /* An error occured that wasn't suppose d to. See debug log for reason. */	FMOD_ERR_EVENT_INTERNAL, /* An error occured that wasn't suppose d to. See debug log for reason. */
	FMOD_ERR_EVENT_MAXSTREAMS, /* Event failed because 'Max streams' w as hit when FMOD_EVENT_INIT_FAIL_ON_MAXSTREAMS was specified. */	FMOD_ERR_EVENT_MAXSTREAMS, /* Event failed because 'Max streams' w as hit when FMOD_EVENT_INIT_FAIL_ON_MAXSTREAMS was specified. */
	FMOD_ERR_EVENT_MISMATCH, /* FSB mismatches the FEV it was compil ed with, the stream/sample mode it was meant to be created with was differe nt, or the FEV was built for a different platform. */	FMOD_ERR_EVENT_MISMATCH, /* FSB mismatches the FEV it was compil ed with, the stream/sample mode it was meant to be created with was differe nt, or the FEV was built for a different platform. */
	FMOD_ERR_EVENT_NAMECONFLICT, /* A category with the same name alread y exists. */	FMOD_ERR_EVENT_NAMECONFLICT, /* A category with the same name alread y exists. */
	FMOD_ERR_EVENT_NOTFOUND, /* The requested event, event group, ev ent category or event property could not be found. */	FMOD_ERR_EVENT_NOTFOUND, /* The requested event, event group, ev ent category or event property could not be found. */
	FMOD_ERR_EVENT_NEEDSSIMPLE, /* Tried to call a function on a comple x event that's only supported by simple events. */	FMOD_ERR_EVENT_NEEDSSIMPLE, /* Tried to call a function on a comple x event that's only supported by simple events. */
	FMOD_ERR_EVENT_GUIDCONFLICT, /* An event with the same GUID already exists. */	FMOD_ERR_EVENT_GUIDCONFLICT, /* An event with the same GUID already exists. */
	FMOD_ERR_EVENT_ALREADY_LOADED, /* The specified project has already be en loaded. Having multiple copies of the same project loaded simultaneously is forbidden. */	FMOD_ERR_EVENT_ALREADY_LOADED, /* The specified project has already be en loaded. Having multiple copies of the same project loaded simultaneously is forbidden. */

	FMOD_ERR_MUSIC_UNINITIALIZED, /* Music system is not initialized prob ably because no music data is loaded. */	FMOD_ERR_MUSIC_UNINITIALIZED, /* Music system is not initialized prob ably because no music data is loaded. */

		FMOD_ERR_MUSIC_NOTFOUND, /* The requested music entity could not
		be found. */
		FMOD_ERR_MUSIC_NOCALLBACK, /* The music callback is required, but
		it has not been set. */

	FMOD_RESULT_FORCEINT = 65536 /* Makes sure this enum is signed 32bit . */	FMOD_RESULT_FORCEINT = 65536 /* Makes sure this enum is signed 32bit . */
	} FMOD_RESULT;	} FMOD_RESULT;
	/$ fmod result end $/	/$ fmod result end $/

	/*	/*
	[ENUM]	[ENUM]
	[	[
	[DESCRIPTION]	[DESCRIPTION]
	These output types are used with System::setOutput / System::getOutput, to choose which output method to use.	These output types are used with System::setOutput / System::getOutput, to choose which output method to use.

	skipping to change at line 323	skipping to change at line 325
	FMOD_OUTPUTTYPE_WAVWRITER_NRT, /* All - Non-realtim e version of FMOD_OUTPUTTYPE_WAVWRITER. User can drive mixer with System:: update at whatever rate they want. */	FMOD_OUTPUTTYPE_WAVWRITER_NRT, /* All - Non-realtim e version of FMOD_OUTPUTTYPE_WAVWRITER. User can drive mixer with System:: update at whatever rate they want. */

	FMOD_OUTPUTTYPE_DSOUND, /* Win32/Win64 - DirectSound output. Use this to get hardware accelerated 3d audio and EAX Reverb supp ort. (Default on Windows) */	FMOD_OUTPUTTYPE_DSOUND, /* Win32/Win64 - DirectSound output. Use this to get hardware accelerated 3d audio and EAX Reverb supp ort. (Default on Windows) */
	FMOD_OUTPUTTYPE_WINMM, /* Win32/Win64 - Windows Mul timedia output. */	FMOD_OUTPUTTYPE_WINMM, /* Win32/Win64 - Windows Mul timedia output. */
	FMOD_OUTPUTTYPE_OPENAL, /* Win32/Win64 - OpenAL 1.1 output. Use this for lower CPU overhead than FMOD_OUTPUTTYPE_DSOUND, and al so Vista H/W support with Creative Labs cards. */	FMOD_OUTPUTTYPE_OPENAL, /* Win32/Win64 - OpenAL 1.1 output. Use this for lower CPU overhead than FMOD_OUTPUTTYPE_DSOUND, and al so Vista H/W support with Creative Labs cards. */
	FMOD_OUTPUTTYPE_WASAPI, /* Win32 - Windows Aud io Session API. (Default on Windows Vista) */	FMOD_OUTPUTTYPE_WASAPI, /* Win32 - Windows Aud io Session API. (Default on Windows Vista) */
	FMOD_OUTPUTTYPE_ASIO, /* Win32 - Low latency ASIO 2.0 driver. */	FMOD_OUTPUTTYPE_ASIO, /* Win32 - Low latency ASIO 2.0 driver. */
	FMOD_OUTPUTTYPE_OSS, /* Linux/Linux64/Solaris - Open Sound System output. (Default on Linux/Linux64/Solaris) */	FMOD_OUTPUTTYPE_OSS, /* Linux/Linux64/Solaris - Open Sound System output. (Default on Linux/Linux64/Solaris) */
	FMOD_OUTPUTTYPE_ALSA, /* Linux/Linux64 - Advanced Li nux Sound Architecture output. */	FMOD_OUTPUTTYPE_ALSA, /* Linux/Linux64 - Advanced Li nux Sound Architecture output. */
	FMOD_OUTPUTTYPE_ESD, /* Linux/Linux64 - Enlightment Sound Daemon output. */	FMOD_OUTPUTTYPE_ESD, /* Linux/Linux64 - Enlightment Sound Daemon output. */

	FMOD_OUTPUTTYPE_SOUNDMANAGER, /* Mac - Macintosh S oundManager output. */
	FMOD_OUTPUTTYPE_COREAUDIO, /* Mac - Macintosh C oreAudio output. (Default on Mac) */	FMOD_OUTPUTTYPE_COREAUDIO, /* Mac - Macintosh C oreAudio output. (Default on Mac) */

	FMOD_OUTPUTTYPE_XBOX, /* Xbox - Native hard ware output. (Default on Xbox) */
	FMOD_OUTPUTTYPE_PS2, /* PS2 - Native hard ware output. (Default on PS2) */	FMOD_OUTPUTTYPE_PS2, /* PS2 - Native hard ware output. (Default on PS2) */
	FMOD_OUTPUTTYPE_PS3, /* PS3 - Native hard ware output. (Default on PS3) */	FMOD_OUTPUTTYPE_PS3, /* PS3 - Native hard ware output. (Default on PS3) */

	FMOD_OUTPUTTYPE_GC, /* GameCube - Native hard ware output. (Default on GameCube) */
	FMOD_OUTPUTTYPE_XBOX360, /* Xbox 360 - Native hard ware output. (Default on Xbox 360) */	FMOD_OUTPUTTYPE_XBOX360, /* Xbox 360 - Native hard ware output. (Default on Xbox 360) */
	FMOD_OUTPUTTYPE_PSP, /* PSP - Native hard ware output. (Default on PSP) */	FMOD_OUTPUTTYPE_PSP, /* PSP - Native hard ware output. (Default on PSP) */
	FMOD_OUTPUTTYPE_WII, /* Wii - Native hardware output. (Default on Wii) */	FMOD_OUTPUTTYPE_WII, /* Wii - Native hardware output. (Default on Wii) */

	FMOD_OUTPUTTYPE_MAX, /* Maximum number of output types supp orted. */	FMOD_OUTPUTTYPE_MAX, /* Maximum number of output types supp orted. */
	FMOD_OUTPUTTYPE_FORCEINT = 65536 /* Makes sure this enum is signed 32bi t. */	FMOD_OUTPUTTYPE_FORCEINT = 65536 /* Makes sure this enum is signed 32bi t. */
	} FMOD_OUTPUTTYPE;	} FMOD_OUTPUTTYPE;

	/*	/*
	[DEFINE]	[DEFINE]

	skipping to change at line 680	skipping to change at line 679
	#define FMOD_INIT_WASAPI_EXCLUSIVE 0x00000100 /* Win32 Vista only - for WASAPI output - Enable exclusive access to hardware, lower latency a t the expense of excluding other applications from accessing the audio hard ware. */	#define FMOD_INIT_WASAPI_EXCLUSIVE 0x00000100 /* Win32 Vista only - for WASAPI output - Enable exclusive access to hardware, lower latency a t the expense of excluding other applications from accessing the audio hard ware. */
	#define FMOD_INIT_DSOUND_HRTFNONE 0x00000200 /* Win32 only - for DirectSound output - FMOD_HARDWARE \| FMOD_3D buffers use simple stereo pan ning/doppler/attenuation when 3D hardware acceleration is not present. */	#define FMOD_INIT_DSOUND_HRTFNONE 0x00000200 /* Win32 only - for DirectSound output - FMOD_HARDWARE \| FMOD_3D buffers use simple stereo pan ning/doppler/attenuation when 3D hardware acceleration is not present. */
	#define FMOD_INIT_DSOUND_HRTFLIGHT 0x00000400 /* Win32 only - for DirectSound output - FMOD_HARDWARE \| FMOD_3D buffers use a slightly higher quality algorithm when 3D hardware acceleration is not present. */	#define FMOD_INIT_DSOUND_HRTFLIGHT 0x00000400 /* Win32 only - for DirectSound output - FMOD_HARDWARE \| FMOD_3D buffers use a slightly higher quality algorithm when 3D hardware acceleration is not present. */
	#define FMOD_INIT_DSOUND_HRTFFULL 0x00000800 /* Win32 only - for DirectSound output - FMOD_HARDWARE \| FMOD_3D buffers use full quality 3D p layback when 3d hardware acceleration is not present. */	#define FMOD_INIT_DSOUND_HRTFFULL 0x00000800 /* Win32 only - for DirectSound output - FMOD_HARDWARE \| FMOD_3D buffers use full quality 3D p layback when 3d hardware acceleration is not present. */
	#define FMOD_INIT_PS2_DISABLECORE0REVERB 0x00010000 /* PS2 only - Disab le reverb on CORE 0 to regain 256k SRAM. */	#define FMOD_INIT_PS2_DISABLECORE0REVERB 0x00010000 /* PS2 only - Disab le reverb on CORE 0 to regain 256k SRAM. */
	#define FMOD_INIT_PS2_DISABLECORE1REVERB 0x00020000 /* PS2 only - Disab le reverb on CORE 1 to regain 256k SRAM. */	#define FMOD_INIT_PS2_DISABLECORE1REVERB 0x00020000 /* PS2 only - Disab le reverb on CORE 1 to regain 256k SRAM. */
	#define FMOD_INIT_PS2_DONTUSESCRATCHPAD 0x00040000 /* PS2 only - Disab le FMOD's usage of the scratchpad. */	#define FMOD_INIT_PS2_DONTUSESCRATCHPAD 0x00040000 /* PS2 only - Disab le FMOD's usage of the scratchpad. */
	#define FMOD_INIT_PS2_SWAPDMACHANNELS 0x00080000 /* PS2 only - Chang es FMOD from using SPU DMA channel 0 for software mixing, and 1 for sound d ata upload/file streaming, to 1 and 0 respectively. */	#define FMOD_INIT_PS2_SWAPDMACHANNELS 0x00080000 /* PS2 only - Chang es FMOD from using SPU DMA channel 0 for software mixing, and 1 for sound d ata upload/file streaming, to 1 and 0 respectively. */
	#define FMOD_INIT_PS3_PREFERDTS 0x00800000 /* PS3 only - Prefe r DTS over Dolby Digital if both are supported. Note: 8 and 6 channel LPCM is always preferred over both DTS and Dolby Digital. */	#define FMOD_INIT_PS3_PREFERDTS 0x00800000 /* PS3 only - Prefe r DTS over Dolby Digital if both are supported. Note: 8 and 6 channel LPCM is always preferred over both DTS and Dolby Digital. */
	#define FMOD_INIT_PS3_FORCE2CHLPCM 0x01000000 /* PS3 only - Force PS3 system output mode to 2 channel LPCM. */	#define FMOD_INIT_PS3_FORCE2CHLPCM 0x01000000 /* PS3 only - Force PS3 system output mode to 2 channel LPCM. */

	#define FMOD_INIT_XBOX_REMOVEHEADROOM 0x00100000 /* Xbox only - By d efault DirectSound attenuates all sound by 6db to avoid clipping/distortion . CAUTION. If you use this flag you are responsible for the final mix to make sure clipping / distortion doesn't happen. */	#define FMOD_INIT_WII_DISABLEDOLBY 0x00100000 /* Wii only - Disab le Dolby Pro Logic surround. Speakermode will be set to STEREO even if user has selected surround in the Wii system settings. */
	#define FMOD_INIT_SYSTEM_MUSICMUTENOTPAUSE 0x00200000 /* Xbox 360 / PS3 - The "music" channelgroup which by default pauses when custom 360 dashboard / PS3 BGM music is played, can be changed to mute (therefore continues pla ying) instead of pausing, by using this flag. */	#define FMOD_INIT_SYSTEM_MUSICMUTENOTPAUSE 0x00200000 /* Xbox 360 / PS3 - The "music" channelgroup which by default pauses when custom 360 dashboard / PS3 BGM music is played, can be changed to mute (therefore continues pla ying) instead of pausing, by using this flag. */
	#define FMOD_INIT_SYNCMIXERWITHUPDATE 0x00400000 /* Win32/Wii/PS3/Xb ox/Xbox 360 - FMOD Mixer thread is woken up to do a mix when System::update is called rather than waking periodically on its own timer. */	#define FMOD_INIT_SYNCMIXERWITHUPDATE 0x00400000 /* Win32/Wii/PS3/Xb ox/Xbox 360 - FMOD Mixer thread is woken up to do a mix when System::update is called rather than waking periodically on its own timer. */

	#define FMOD_INIT_DTS_NEURALSURROUND 0x02000000 /* Win32/Mac/Linux/ Solaris - Use DTS Neural surround downmixing from 7.1 if speakermode set to FMOD_SPEAKERMODE_STEREO or FMOD_SPEAKERMODE_5POINT1. Internal DSP structu re will be set to 7.1. */	#define FMOD_INIT_DTS_NEURALSURROUND 0x02000000 /* Win32/Mac/Linux/ Solaris/PS3/Xbox360 - Use DTS Neural surround downmixing from 7.1 if speake rmode set to FMOD_SPEAKERMODE_STEREO or FMOD_SPEAKERMODE_5POINT1. Always 7. 1 -> 5.1 downmix for Xbox360 and PS3. Internal DSP structure will be set t o 7.1. */
	#define FMOD_INIT_GEOMETRY_USECLOSEST 0x04000000 /* All platforms - With the geometry engine, only process the closest polygon rather than accu mulating all polygons the sound to listener line intersects. */	#define FMOD_INIT_GEOMETRY_USECLOSEST 0x04000000 /* All platforms - With the geometry engine, only process the closest polygon rather than accu mulating all polygons the sound to listener line intersects. */

		#define FMOD_INIT_DISABLE_MYEARS 0x08000000 /* Win32 - Disables MyEars HRTF 7.1 downmixing. MyEars will otherwise be disbaled if speakerm ode is not set to FMOD_SPEAKERMODE_STEREO or the data file is missing. */
	/* [DEFINE_END] */	/* [DEFINE_END] */

	/*	/*
	[ENUM]	[ENUM]
	[	[
	[DESCRIPTION]	[DESCRIPTION]
	These definitions describe the type of song being played.	These definitions describe the type of song being played.

	[REMARKS]	[REMARKS]


	skipping to change at line 754	skipping to change at line 754

	[SEE_ALSO]	[SEE_ALSO]
	System::createSound	System::createSound
	Sound::getFormat	Sound::getFormat
	]	]
	*/	*/
	typedef enum	typedef enum
	{	{
	FMOD_SOUND_FORMAT_NONE, /* Unitialized / unknown. */	FMOD_SOUND_FORMAT_NONE, /* Unitialized / unknown. */
	FMOD_SOUND_FORMAT_PCM8, /* 8bit integer PCM data. */	FMOD_SOUND_FORMAT_PCM8, /* 8bit integer PCM data. */

	FMOD_SOUND_FORMAT_PCM16, /* 16bit integer PCM data. */	FMOD_SOUND_FORMAT_PCM16, /* 16bit integer PCM data. */
	FMOD_SOUND_FORMAT_PCM24, /* 24bit integer PCM data. */	FMOD_SOUND_FORMAT_PCM24, /* 24bit integer PCM data. */
	FMOD_SOUND_FORMAT_PCM32, /* 32bit integer PCM data. */	FMOD_SOUND_FORMAT_PCM32, /* 32bit integer PCM data. */
	FMOD_SOUND_FORMAT_PCMFLOAT, /* 32bit floating point PCM data.	FMOD_SOUND_FORMAT_PCMFLOAT, /* 32bit floating point PCM data. *
	*/	/
	FMOD_SOUND_FORMAT_GCADPCM, /* Compressed GameCube DSP data. */	FMOD_SOUND_FORMAT_GCADPCM, /* Compressed GameCube DSP data. */
	FMOD_SOUND_FORMAT_IMAADPCM, /* Compressed IMA ADPCM / Xbox ADPC M data. */	FMOD_SOUND_FORMAT_IMAADPCM, /* Compressed IMA ADPCM / Xbox ADPC M data. */
	FMOD_SOUND_FORMAT_VAG, /* Compressed PlayStation 2 / PlayS tation Portable ADPCM data. */	FMOD_SOUND_FORMAT_VAG, /* Compressed PlayStation 2 / PlayS tation Portable ADPCM data. */
	FMOD_SOUND_FORMAT_XMA, /* Compressed Xbox360 data. */	FMOD_SOUND_FORMAT_XMA, /* Compressed Xbox360 data. */
	FMOD_SOUND_FORMAT_MPEG, /* Compressed MPEG layer 2 or 3 dat a. */	FMOD_SOUND_FORMAT_MPEG, /* Compressed MPEG layer 2 or 3 dat a. */

		FMOD_SOUND_FORMAT_CELT, /* Compressed CELT data. */

	FMOD_SOUND_FORMAT_MAX, /* Maximum number of sound formats supported. */	FMOD_SOUND_FORMAT_MAX, /* Maximum number of sound formats supported. */
	FMOD_SOUND_FORMAT_FORCEINT = 65536 /* Makes sure this enum is signed 3 2bit. */	FMOD_SOUND_FORMAT_FORCEINT = 65536 /* Makes sure this enum is signed 3 2bit. */
	} FMOD_SOUND_FORMAT;	} FMOD_SOUND_FORMAT;

	/*	/*
	[DEFINE]	[DEFINE]
	[	[
	[NAME]	[NAME]
	FMOD_MODE	FMOD_MODE

	skipping to change at line 1079	skipping to change at line 1080

	[SEE_ALSO]	[SEE_ALSO]
	System::setSoftwareFormat	System::setSoftwareFormat
	System::getSoftwareFormat	System::getSoftwareFormat
	]	]
	*/	*/
	typedef enum	typedef enum
	{	{
	FMOD_DSP_RESAMPLER_NOINTERP, /* No interpolation. High frequenc y aliasing hiss will be audible depending on the sample rate of the sound. */	FMOD_DSP_RESAMPLER_NOINTERP, /* No interpolation. High frequenc y aliasing hiss will be audible depending on the sample rate of the sound. */
	FMOD_DSP_RESAMPLER_LINEAR, /* Linear interpolation (default me thod). Fast and good quality, causes very slight lowpass effect on low fre quency sounds. */	FMOD_DSP_RESAMPLER_LINEAR, /* Linear interpolation (default me thod). Fast and good quality, causes very slight lowpass effect on low fre quency sounds. */

	FMOD_DSP_RESAMPLER_CUBIC, /* Cubic interoplation. Slower tha	FMOD_DSP_RESAMPLER_CUBIC, /* Cubic interpolation. Slower tha
	n linear interpolation but better quality. */	n linear interpolation but better quality. */
	FMOD_DSP_RESAMPLER_SPLINE, /* 5 point spline interoplation. S	FMOD_DSP_RESAMPLER_SPLINE, /* 5 point spline interpolation. S
	lowest resampling method but best quality. */	lowest resampling method but best quality. */

	FMOD_DSP_RESAMPLER_MAX, /* Maximum number of resample metho ds supported. */	FMOD_DSP_RESAMPLER_MAX, /* Maximum number of resample metho ds supported. */
	FMOD_DSP_RESAMPLER_FORCEINT = 65536 /* Makes sure this enum is signed 3 2bit. */	FMOD_DSP_RESAMPLER_FORCEINT = 65536 /* Makes sure this enum is signed 3 2bit. */
	} FMOD_DSP_RESAMPLER;	} FMOD_DSP_RESAMPLER;

	/*	/*
	[ENUM]	[ENUM]
	[	[
	[DESCRIPTION]	[DESCRIPTION]
	List of tag types that could be stored within a sound. These include i d3 tags, metadata from netstreams and vorbis/asf data.	List of tag types that could be stored within a sound. These include i d3 tags, metadata from netstreams and vorbis/asf data.

	skipping to change at line 1461	skipping to change at line 1462

	[SEE_ALSO]	[SEE_ALSO]
	System::setReverbProperties	System::setReverbProperties
	System::getReverbProperties	System::getReverbProperties
	FMOD_REVERB_PRESETS	FMOD_REVERB_PRESETS
	FMOD_REVERB_FLAGS	FMOD_REVERB_FLAGS
	]	]
	*/	*/
	typedef struct FMOD_REVERB_PROPERTIES	typedef struct FMOD_REVERB_PROPERTIES
	{ /* MIN MAX DEFAULT DE SCRIPTION */	{ /* MIN MAX DEFAULT DE SCRIPTION */

	int Instance; /* [in] 0 , 3 , 0 , En vironment Instance. Simultaneous HW reverbs are possible on some platforms. (SUPPORTED:EAX4/SFX(3 instances) and Wii (2 instances)) */	int Instance; /* [in] 0 , 3 , 0 , En vironment Instance. Simultaneous HW reverbs are possible on some platforms. (SUPPORTED:EAX4/SFX(4 instances) and Wii (3 instances)) */
	int Environment; /* [in/out] -1 , 25 , -1 , se ts all listener properties. -1 = OFF. (SUPPORTED:EAX/PS2) */	int Environment; /* [in/out] -1 , 25 , -1 , se ts all listener properties. -1 = OFF. (SUPPORTED:EAX/PS2) */
	float EnvSize; /* [in/out] 1.0 , 100.0 , 7.5 , en vironment size in meters (SUPPORTED:EAX) */	float EnvSize; /* [in/out] 1.0 , 100.0 , 7.5 , en vironment size in meters (SUPPORTED:EAX) */
	float EnvDiffusion; /* [in/out] 0.0 , 1.0 , 1.0 , en vironment diffusion (SUPPORTED:EAX) */	float EnvDiffusion; /* [in/out] 0.0 , 1.0 , 1.0 , en vironment diffusion (SUPPORTED:EAX) */
	int Room; /* [in/out] -10000, 0 , -1000 , ro om effect level (at mid frequencies) (SUPPORTED:EAX/I3DL2/SFX) */	int Room; /* [in/out] -10000, 0 , -1000 , ro om effect level (at mid frequencies) (SUPPORTED:EAX/I3DL2/SFX) */
	int RoomHF; /* [in/out] -10000, 0 , -100 , re lative room effect level at high frequencies (SUPPORTED:EAX/I3DL2/SFX) */	int RoomHF; /* [in/out] -10000, 0 , -100 , re lative room effect level at high frequencies (SUPPORTED:EAX/I3DL2/SFX) */
	int RoomLF; /* [in/out] -10000, 0 , 0 , re lative room effect level at low frequencies (SUPPORTED:EAX/SFX) */	int RoomLF; /* [in/out] -10000, 0 , 0 , re lative room effect level at low frequencies (SUPPORTED:EAX/SFX) */
	float DecayTime; /* [in/out] 0.1 , 20.0 , 1.49 , re verberation decay time at mid frequencies (SUPPORTED:EAX/I3DL2/SFX) */	float DecayTime; /* [in/out] 0.1 , 20.0 , 1.49 , re verberation decay time at mid frequencies (SUPPORTED:EAX/I3DL2/SFX) */
	float DecayHFRatio; /* [in/out] 0.1 , 2.0 , 0.83 , hi gh-frequency to mid-frequency decay time ratio (SUPPORTED:EAX/I3DL2/SFX) */	float DecayHFRatio; /* [in/out] 0.1 , 2.0 , 0.83 , hi gh-frequency to mid-frequency decay time ratio (SUPPORTED:EAX/I3DL2/SFX) */
	float DecayLFRatio; /* [in/out] 0.1 , 2.0 , 1.0 , lo w-frequency to mid-frequency decay time ratio (SUPPORTED:EAX) */	float DecayLFRatio; /* [in/out] 0.1 , 2.0 , 1.0 , lo w-frequency to mid-frequency decay time ratio (SUPPORTED:EAX) */
	int Reflections; /* [in/out] -10000, 1000 , -2602 , ea rly reflections level relative to room effect (SUPPORTED:EAX/I3DL2/SFX) */	int Reflections; /* [in/out] -10000, 1000 , -2602 , ea rly reflections level relative to room effect (SUPPORTED:EAX/I3DL2/SFX) */

	skipping to change at line 1661	skipping to change at line 1662
	float OcclusionLFRatio; /* [in/out] 0.0, 1.0, 0.25, occlusion low-frequency level re. main control (SUPPORTED:EAX/ I3DL2) */	float OcclusionLFRatio; /* [in/out] 0.0, 1.0, 0.25, occlusion low-frequency level re. main control (SUPPORTED:EAX/ I3DL2) */
	float OcclusionRoomRatio; /* [in/out] 0.0, 10.0, 1.5, relative occlusion control for room effect (SUPPORTED:EAX only) */	float OcclusionRoomRatio; /* [in/out] 0.0, 10.0, 1.5, relative occlusion control for room effect (SUPPORTED:EAX only) */
	float OcclusionDirectRatio; /* [in/out] 0.0, 10.0, 1.0, relative occlusion control for direct path (SUPPORTED:EAX only) */	float OcclusionDirectRatio; /* [in/out] 0.0, 10.0, 1.0, relative occlusion control for direct path (SUPPORTED:EAX only) */
	int Exclusion; /* [in/out] -10000, 0, 0, main exlusion control (attenuation at high frequencies) (SUPPORTED:EAX only) */	int Exclusion; /* [in/out] -10000, 0, 0, main exlusion control (attenuation at high frequencies) (SUPPORTED:EAX only) */
	float ExclusionLFRatio; /* [in/out] 0.0, 1.0, 1.0, exclusion low-frequency level re. main control (SUPPORTED:EAX only) */	float ExclusionLFRatio; /* [in/out] 0.0, 1.0, 1.0, exclusion low-frequency level re. main control (SUPPORTED:EAX only) */
	int OutsideVolumeHF; /* [in/out] -10000, 0, 0, outside sound cone level at high frequencies (SUPPORTED:EAX only) */	int OutsideVolumeHF; /* [in/out] -10000, 0, 0, outside sound cone level at high frequencies (SUPPORTED:EAX only) */
	float DopplerFactor; /* [in/out] 0.0, 10.0, 0.0, like DS3D flDopplerFactor but per source (SUPPORTED:EAX only) */	float DopplerFactor; /* [in/out] 0.0, 10.0, 0.0, like DS3D flDopplerFactor but per source (SUPPORTED:EAX only) */
	float RolloffFactor; /* [in/out] 0.0, 10.0, 0.0, like DS3D flRolloffFactor but per source (SUPPORTED:EAX only) */	float RolloffFactor; /* [in/out] 0.0, 10.0, 0.0, like DS3D flRolloffFactor but per source (SUPPORTED:EAX only) */
	float RoomRolloffFactor; /* [in/out] 0.0, 10.0, 0.0, like DS3D flRolloffFactor but for room effect (SUPPORTED:EAX/ I3DL2) */	float RoomRolloffFactor; /* [in/out] 0.0, 10.0, 0.0, like DS3D flRolloffFactor but for room effect (SUPPORTED:EAX/ I3DL2) */
	float AirAbsorptionFactor; /* [in/out] 0.0, 10.0, 1.0, multiplies AirAbsorptionHF member of FMOD_REVERB_PROPERTIES (SUPPORTED:EAX only) */	float AirAbsorptionFactor; /* [in/out] 0.0, 10.0, 1.0, multiplies AirAbsorptionHF member of FMOD_REVERB_PROPERTIES (SUPPORTED:EAX only) */

	unsigned int Flags; /* [in/out] FMOD_REVERB_CHANNELFLAGS - modifies the behavior of properties (SUPPORTED:EAX only) */	unsigned int Flags; /* [in/out] FMOD_REVERB_CHANNELFLAGS - modifies the behavior of properties (SUPPORTED:EAX/ SFX) */
	FMOD_DSP ConnectionPoint; / [in/out] See remarks. DSP network location to connect reverb for this channel. (SUPPORTED:SFX only).*/	FMOD_DSP ConnectionPoint; / [in/out] See remarks. DSP network location to connect reverb for this channel. (SUPPORTED:SFX only).*/
	} FMOD_REVERB_CHANNELPROPERTIES;	} FMOD_REVERB_CHANNELPROPERTIES;

	/*	/*
	[DEFINE]	[DEFINE]
	[	[
	[NAME]	[NAME]
	FMOD_REVERB_CHANNELFLAGS	FMOD_REVERB_CHANNELFLAGS

	[DESCRIPTION]	[DESCRIPTION]

	skipping to change at line 1692	skipping to change at line 1693
	[PLATFORMS]	[PLATFORMS]
	Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation 2, PlaySt ation Portable, PlayStation 3, Wii, Solaris, iPhone	Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation 2, PlaySt ation Portable, PlayStation 3, Wii, Solaris, iPhone

	[SEE_ALSO]	[SEE_ALSO]
	FMOD_REVERB_CHANNELPROPERTIES	FMOD_REVERB_CHANNELPROPERTIES
	]	]
	*/	*/
	#define FMOD_REVERB_CHANNELFLAGS_DIRECTHFAUTO 0x00000001 /* Automatic sett ing of 'Direct' due to distance from listener */	#define FMOD_REVERB_CHANNELFLAGS_DIRECTHFAUTO 0x00000001 /* Automatic sett ing of 'Direct' due to distance from listener */
	#define FMOD_REVERB_CHANNELFLAGS_ROOMAUTO 0x00000002 /* Automatic sett ing of 'Room' due to distance from listener */	#define FMOD_REVERB_CHANNELFLAGS_ROOMAUTO 0x00000002 /* Automatic sett ing of 'Room' due to distance from listener */
	#define FMOD_REVERB_CHANNELFLAGS_ROOMHFAUTO 0x00000004 /* Automatic sett ing of 'RoomHF' due to distance from listener */	#define FMOD_REVERB_CHANNELFLAGS_ROOMHFAUTO 0x00000004 /* Automatic sett ing of 'RoomHF' due to distance from listener */

	#define FMOD_REVERB_CHANNELFLAGS_INSTANCE0 0x00000010 /* EAX4/SFX/GameC	#define FMOD_REVERB_CHANNELFLAGS_INSTANCE0 0x00000010 /* EAX4/SFX/Wii.
	ube/Wii. Specify channel to target reverb instance 0. Default target. */	Specify channel to target reverb instance 0. Default target. */
	#define FMOD_REVERB_CHANNELFLAGS_INSTANCE1 0x00000020 /* EAX4/SFX/GameC	#define FMOD_REVERB_CHANNELFLAGS_INSTANCE1 0x00000020 /* EAX4/SFX/Wii.
	ube/Wii. Specify channel to target reverb instance 1. */	Specify channel to target reverb instance 1. */
	#define FMOD_REVERB_CHANNELFLAGS_INSTANCE2 0x00000040 /* EAX4/SFX/GameC	#define FMOD_REVERB_CHANNELFLAGS_INSTANCE2 0x00000040 /* EAX4/SFX/Wii.
	ube/Wii. Specify channel to target reverb instance 2. */	Specify channel to target reverb instance 2. */
	#define FMOD_REVERB_CHANNELFLAGS_INSTANCE3 0x00000080 /* EAX5/SFX. Spec ify channel to target reverb instance 3. */	#define FMOD_REVERB_CHANNELFLAGS_INSTANCE3 0x00000080 /* EAX5/SFX. Spec ify channel to target reverb instance 3. */

	#define FMOD_REVERB_CHANNELFLAGS_DEFAULT (FMOD_REVERB_CHANNELFLAGS_DI RECTHFAUTO \| \	#define FMOD_REVERB_CHANNELFLAGS_DEFAULT (FMOD_REVERB_CHANNELFLAGS_DI RECTHFAUTO \| \
	FMOD_REVERB_CHANNELFLAGS_RO OMAUTO\| \	FMOD_REVERB_CHANNELFLAGS_RO OMAUTO\| \
	FMOD_REVERB_CHANNELFLAGS_RO OMHFAUTO\| \	FMOD_REVERB_CHANNELFLAGS_RO OMHFAUTO\| \
	FMOD_REVERB_CHANNELFLAGS_IN STANCE0)	FMOD_REVERB_CHANNELFLAGS_IN STANCE0)
	/* [DEFINE_END] */	/* [DEFINE_END] */

	/*	/*
	[STRUCTURE]	[STRUCTURE]

	skipping to change at line 1731	skipping to change at line 1732

	[SEE_ALSO]	[SEE_ALSO]
	System::setAdvancedSettings	System::setAdvancedSettings
	System::getAdvancedSettings	System::getAdvancedSettings
	System::init	System::init
	FMOD_MODE	FMOD_MODE
	]	]
	*/	*/
	typedef struct FMOD_ADVANCEDSETTINGS	typedef struct FMOD_ADVANCEDSETTINGS
	{	{

	int cbsize; /* [in] Size of this stru	int cbsize; /* [in] Size of this st
	cture. Use sizeof(FMOD_ADVANCEDSETTINGS) NOTE: This must be set before ca	ructure. Use sizeof(FMOD_ADVANCEDSETTINGS) NOTE: This must be set before
	lling System::getAdvancedSettings! */	calling System::getAdvancedSettings! */
	int maxMPEGcodecs; /* [in/out] Optional. Specify	int maxMPEGcodecs; /* [in/out] Optional. Speci
	0 to ignore. For use with FMOD_CREATECOMPRESSEDSAMPLE only. Mpeg codecs	fy 0 to ignore. For use with FMOD_CREATECOMPRESSEDSAMPLE only. Mpeg codec
	consume 21,684 bytes per instance and this number will determine how many m	s consume 21,684 bytes per instance and this number will determine how many
	peg channels can be played simultaneously. Default = 16. */	mpeg channels can be played simultaneously. Default = 16. */
	int maxADPCMcodecs; /* [in/out] Optional. Specify	int maxADPCMcodecs; /* [in/out] Optional. Speci
	0 to ignore. For use with FMOD_CREATECOMPRESSEDSAMPLE only. ADPCM codecs	fy 0 to ignore. For use with FMOD_CREATECOMPRESSEDSAMPLE only. ADPCM codec
	consume 2,136 bytes per instance (based on FSB encoded ADPCM block size - s	s consume 2,136 bytes per instance (based on FSB encoded ADPCM block size -
	ee remarks) and this number will determine how many ADPCM channels can be p	see remarks) and this number will determine how many ADPCM channels can be
	layed simultaneously. Default = 32. */	played simultaneously. Default = 32. */
	int maxXMAcodecs; /* [in/out] Optional. Specify	int maxXMAcodecs; /* [in/out] Optional. Speci
	0 to ignore. For use with FMOD_CREATECOMPRESSEDSAMPLE only. XMA codecs	fy 0 to ignore. For use with FMOD_CREATECOMPRESSEDSAMPLE only. XMA codec
	consume 14,836 bytes per instance and this number will determine how many X	s consume 14,836 bytes per instance and this number will determine how many
	MA channels can be played simultaneously. Default = 32. */	XMA channels can be played simultaneously. Default = 32. */
	int maxPCMcodecs; /* [in/out] Optional. Specify	int maxCELTcodecs; /* [in/out] Optional. Speci
	0 to ignore. For use with PS3 only. PCM codecs	fy 0 to ignore. For use with FMOD_CREATECOMPRESSEDSAMPLE only. CELT codec
	consume 12,672 bytes per instance and this number will determine how many s	s consume 11,500 bytes per instance and this number will determine how many
	treams and PCM voices can be played simultaneously. Default = 16 */	CELT channels can be played simultaneously. Default = 16 */
	int ASIONumChannels; /* [in/out] Optional. Specify	int maxPCMcodecs; /* [in/out] Optional. Speci
	0 to ignore. Number of channels available on the ASIO device. */	fy 0 to ignore. For use with PS3 only. PCM codec
	char *ASIOChannelList; / [in/out] Optional. Specify	s consume 12,672 bytes per instance and this number will determine how many
	0 to ignore. Pointer to an array of strings (number of entries defined by	streams and PCM voices can be played simultaneously. Default = 16 */
	ASIONumChannels) with ASIO channel names. */	int ASIONumChannels; /* [in/out] Optional. Speci
	FMOD_SPEAKER ASIOSpeakerList; / [in/out] Optional. Specify	fy 0 to ignore. Number of channels available on the ASIO device. */
	0 to ignore. Pointer to a list of speakers that the ASIO channels map to.	char *ASIOChannelList; / [in/out] Optional. Speci
	This can be called after System::init to remap ASIO output. */	fy 0 to ignore. Pointer to an array of strings (number of entries defined b
	int max3DReverbDSPs; /* [in/out] Optional. Specify	y ASIONumChannels) with ASIO channel names. */
	0 to ignore. The max number of 3d reverb DSP's in the system. (NOTE: CURRE	FMOD_SPEAKER ASIOSpeakerList; / [in/out] Optional. Speci
	NTLY DISABLED / UNUSED) */	fy 0 to ignore. Pointer to a list of speakers that the ASIO channels map to
	float HRTFMinAngle; /* [in/out] Optional. Specify	. This can be called after System::init to remap ASIO output. */
	0 to ignore. For use with FMOD_INIT_SOFTWARE_HRTF. The angle range (0-360	int max3DReverbDSPs; /* [in/out] Optional. Speci
	) of a 3D sound in relation to the listener, at which the HRTF function beg	fy 0 to ignore. The max number of 3d reverb DSP's in the system. (NOTE: CUR
	ins to have an effect. 0 = in front of the listener. 180 = from 90 degrees	RENTLY DISABLED / UNUSED) */
	to the left of the listener to 90 degrees to the right. 360 = behind the li	float HRTFMinAngle; /* [in/out] Optional. Speci
	stener. Default = 180.0. */	fy 0 to ignore. For use with FMOD_INIT_SOFTWARE_HRTF. The angle range (0-3
	float HRTFMaxAngle; /* [in/out] Optional. Specify	60) of a 3D sound in relation to the listener, at which the HRTF function b
	0 to ignore. For use with FMOD_INIT_SOFTWARE_HRTF. The angle range (0-360	egins to have an effect. 0 = in front of the listener. 180 = from 90 degree
	) of a 3D sound in relation to the listener, at which the HRTF function has	s to the left of the listener to 90 degrees to the right. 360 = behind the
	maximum effect. 0 = front of the listener. 180 = from 90 degrees to the le	listener. Default = 180.0. */
	ft of the listener to 90 degrees to the right. 360 = behind the listener. D	float HRTFMaxAngle; /* [in/out] Optional. Speci
	efault = 360.0. */	fy 0 to ignore. For use with FMOD_INIT_SOFTWARE_HRTF. The angle range (0-3
	float HRTFFreq; /* [in/out] Optional. Specify	60) of a 3D sound in relation to the listener, at which the HRTF function h
	0 to ignore. For use with FMOD_INIT_SOFTWARE_HRTF. The cutoff frequency o	as maximum effect. 0 = front of the listener. 180 = from 90 degrees to the
	f the HRTF's lowpass filter function when at maximum effect. (i.e. at HRTFM	left of the listener to 90 degrees to the right. 360 = behind the listener.
	axAngle). Default = 4000.0. */	Default = 360.0. */
	float vol0virtualvol; /* [in/out] Optional. Specify	float HRTFFreq; /* [in/out] Optional. Speci
	0 to ignore. For use with FMOD_INIT_VOL0_BECOMES_VIRTUAL. If this flag is	fy 0 to ignore. For use with FMOD_INIT_SOFTWARE_HRTF. The cutoff frequency
	used, and the volume is 0.0, then the sound will become virtual. Use this	of the HRTF's lowpass filter function when at maximum effect. (i.e. at HRT
	value to raise the threshold to a different point where a sound goes virtu	FMaxAngle). Default = 4000.0. */
	al. */	float vol0virtualvol; /* [in/out] Optional. Speci
	int eventqueuesize; /* [in/out] Optional. Specify	fy 0 to ignore. For use with FMOD_INIT_VOL0_BECOMES_VIRTUAL. If this flag
	0 to ignore. For use with FMOD Event system only. Specifies the number of	is used, and the volume is 0.0, then the sound will become virtual. Use th
	slots available for simultaneous non blocking loads. Default = 32. */	is value to raise the threshold to a different point where a sound goes vir
	unsigned int defaultDecodeBufferSize; /* [in/out] Optional. Specify	tual. */
	0 to ignore. For streams. This determines the default size of the double b	int eventqueuesize; /* [in/out] Optional. Speci
	uffer (in milliseconds) that a stream uses. Default = 400ms */	fy 0 to ignore. For use with FMOD Event system only. Specifies the number
	char debugLogFilename; / [in/out] Optional. Specify	of slots available for simultaneous non blocking loads. Default = 32. */
	0 to ignore. Gives fmod's logging system a path/filename. Normally the lo	unsigned int defaultDecodeBufferSize; /* [in/out] Optional. Speci
	g is placed in the same directory as the executable and called fmod.log. Wh	fy 0 to ignore. For streams. This determines the default size of the double
	en using System::getAdvancedSettings, provide at least 256 bytes of memory	buffer (in milliseconds) that a stream uses. Default = 400ms */
	to copy into. */	char debugLogFilename; / [in/out] Optional. Speci
	unsigned short profileport; /* [in/out] Optional. Specify	fy 0 to ignore. Gives fmod's logging system a path/filename. Normally the
	0 to ignore. For use with FMOD_INIT_ENABLE_PROFILE. Specify the port to l	log is placed in the same directory as the executable and called fmod.log.
	isten on for connections by the profiler application. */	When using System::getAdvancedSettings, provide at least 256 bytes of memor
	unsigned int geometryThreadPeriod; /* [in/out] Optional. Specify	y to copy into. */
	0 to ignore. Thread period for FMOD geometry thread. */	unsigned short profileport; /* [in/out] Optional. Speci
		fy 0 to ignore. For use with FMOD_INIT_ENABLE_PROFILE. Specify the port to
		listen on for connections by the profiler application. */
		unsigned int geometryMaxFadeTime; /* [in/out] Optional. Speci
		fy 0 to ignore. The maximum time in miliseconds it takes for a channel to f
		ade to the new level when its occlusion changes. */
		unsigned int maxSpectrumWaveDataBuffers; /* [in/out] Optional. Speci
		fy 0 to ignore. Tells System::init to allocate a pool of wavedata/spectrum
		buffers to prevent memory fragmentation, any additional buffers will be all
		ocated normally. */
	} FMOD_ADVANCEDSETTINGS;	} FMOD_ADVANCEDSETTINGS;

	/*	/*
	[ENUM]	[ENUM]
	[	[
	[DESCRIPTION]	[DESCRIPTION]
	Special channel index values for FMOD functions.	Special channel index values for FMOD functions.

	[REMARKS]	[REMARKS]
	To get 'all' of the channels, use System::getMasterChannelGroup.	To get 'all' of the channels, use System::getMasterChannelGroup.

	skipping to change at line 1821	skipping to change at line 1824
	*/	*/

	/*	/*
	Pre-init functions.	Pre-init functions.
	*/	*/

	FMOD_RESULT F_API FMOD_System_SetOutput (FMOD_SYSTEM *system, FMOD_OUTPUTTYPE output);	FMOD_RESULT F_API FMOD_System_SetOutput (FMOD_SYSTEM *system, FMOD_OUTPUTTYPE output);
	FMOD_RESULT F_API FMOD_System_GetOutput (FMOD_SYSTEM system, FMOD_OUTPUTTYPE output);	FMOD_RESULT F_API FMOD_System_GetOutput (FMOD_SYSTEM system, FMOD_OUTPUTTYPE output);
	FMOD_RESULT F_API FMOD_System_GetNumDrivers (FMOD_SYSTEM system, int numdrivers);	FMOD_RESULT F_API FMOD_System_GetNumDrivers (FMOD_SYSTEM system, int numdrivers);
	FMOD_RESULT F_API FMOD_System_GetDriverInfo (FMOD_SYSTEM system, int id, char name, int namelen, FMOD_GUID *guid);	FMOD_RESULT F_API FMOD_System_GetDriverInfo (FMOD_SYSTEM system, int id, char name, int namelen, FMOD_GUID *guid);

		FMOD_RESULT F_API FMOD_System_GetDriverInfoW (FMOD_SYSTEM system, int id, short name, int namelen, FMOD_GUID *guid);
	FMOD_RESULT F_API FMOD_System_GetDriverCaps (FMOD_SYSTEM system, int id, FMOD_CAPS caps, int minfrequency, int maxfrequency, FMOD_SPEAKER MODE *controlpanelspeakermode);	FMOD_RESULT F_API FMOD_System_GetDriverCaps (FMOD_SYSTEM system, int id, FMOD_CAPS caps, int minfrequency, int maxfrequency, FMOD_SPEAKER MODE *controlpanelspeakermode);
	FMOD_RESULT F_API FMOD_System_SetDriver (FMOD_SYSTEM *system, int driver);	FMOD_RESULT F_API FMOD_System_SetDriver (FMOD_SYSTEM *system, int driver);
	FMOD_RESULT F_API FMOD_System_GetDriver (FMOD_SYSTEM system, int driver);	FMOD_RESULT F_API FMOD_System_GetDriver (FMOD_SYSTEM system, int driver);
	FMOD_RESULT F_API FMOD_System_SetHardwareChannels (FMOD_SYSTEM *system, int min2d, int max2d, int min3d, int max3d);	FMOD_RESULT F_API FMOD_System_SetHardwareChannels (FMOD_SYSTEM *system, int min2d, int max2d, int min3d, int max3d);
	FMOD_RESULT F_API FMOD_System_SetSoftwareChannels (FMOD_SYSTEM *system, int numsoftwarechannels);	FMOD_RESULT F_API FMOD_System_SetSoftwareChannels (FMOD_SYSTEM *system, int numsoftwarechannels);
	FMOD_RESULT F_API FMOD_System_GetSoftwareChannels (FMOD_SYSTEM system, int numsoftwarechannels);	FMOD_RESULT F_API FMOD_System_GetSoftwareChannels (FMOD_SYSTEM system, int numsoftwarechannels);
	FMOD_RESULT F_API FMOD_System_SetSoftwareFormat (FMOD_SYSTEM *system, int samplerate, FMOD_SOUND_FORMAT format, int numoutputchannels, int maxinp utchannels, FMOD_DSP_RESAMPLER resamplemethod);	FMOD_RESULT F_API FMOD_System_SetSoftwareFormat (FMOD_SYSTEM *system, int samplerate, FMOD_SOUND_FORMAT format, int numoutputchannels, int maxinp utchannels, FMOD_DSP_RESAMPLER resamplemethod);
	FMOD_RESULT F_API FMOD_System_GetSoftwareFormat (FMOD_SYSTEM system, int samplerate, FMOD_SOUND_FORMAT format, int numoutputchannels, int ma xinputchannels, FMOD_DSP_RESAMPLER resamplemethod, int *bits);	FMOD_RESULT F_API FMOD_System_GetSoftwareFormat (FMOD_SYSTEM system, int samplerate, FMOD_SOUND_FORMAT format, int numoutputchannels, int ma xinputchannels, FMOD_DSP_RESAMPLER resamplemethod, int *bits);
	FMOD_RESULT F_API FMOD_System_SetDSPBufferSize (FMOD_SYSTEM *system, unsigned int bufferlength, int numbuffers);	FMOD_RESULT F_API FMOD_System_SetDSPBufferSize (FMOD_SYSTEM *system, unsigned int bufferlength, int numbuffers);
	FMOD_RESULT F_API FMOD_System_GetDSPBufferSize (FMOD_SYSTEM system, unsigned int bufferlength, int *numbuffers);	FMOD_RESULT F_API FMOD_System_GetDSPBufferSize (FMOD_SYSTEM system, unsigned int bufferlength, int *numbuffers);

	skipping to change at line 1938	skipping to change at line 1942
	FMOD_RESULT F_API FMOD_System_LockDSP (FMOD_SYSTEM *system);	FMOD_RESULT F_API FMOD_System_LockDSP (FMOD_SYSTEM *system);
	FMOD_RESULT F_API FMOD_System_UnlockDSP (FMOD_SYSTEM *system);	FMOD_RESULT F_API FMOD_System_UnlockDSP (FMOD_SYSTEM *system);
	FMOD_RESULT F_API FMOD_System_GetDSPClock (FMOD_SYSTEM system, unsigned int hi, unsigned int *lo);	FMOD_RESULT F_API FMOD_System_GetDSPClock (FMOD_SYSTEM system, unsigned int hi, unsigned int *lo);

	/*	/*
	Recording API.	Recording API.
	*/	*/

	FMOD_RESULT F_API FMOD_System_GetRecordNumDrivers (FMOD_SYSTEM system, int numdrivers);	FMOD_RESULT F_API FMOD_System_GetRecordNumDrivers (FMOD_SYSTEM system, int numdrivers);
	FMOD_RESULT F_API FMOD_System_GetRecordDriverInfo (FMOD_SYSTEM system, int id, char name, int namelen, FMOD_GUID *guid);	FMOD_RESULT F_API FMOD_System_GetRecordDriverInfo (FMOD_SYSTEM system, int id, char name, int namelen, FMOD_GUID *guid);

		FMOD_RESULT F_API FMOD_System_GetRecordDriverInfoW (FMOD_SYSTEM system, int id, short name, int namelen, FMOD_GUID *guid);
	FMOD_RESULT F_API FMOD_System_GetRecordDriverCaps (FMOD_SYSTEM system, int id, FMOD_CAPS caps, int minfrequency, int maxfrequency);	FMOD_RESULT F_API FMOD_System_GetRecordDriverCaps (FMOD_SYSTEM system, int id, FMOD_CAPS caps, int minfrequency, int maxfrequency);
	FMOD_RESULT F_API FMOD_System_GetRecordPosition (FMOD_SYSTEM system, int id, unsigned int position);	FMOD_RESULT F_API FMOD_System_GetRecordPosition (FMOD_SYSTEM system, int id, unsigned int position);

	FMOD_RESULT F_API FMOD_System_RecordStart (FMOD_SYSTEM system, int id, FMOD_SOUND sound, FMOD_BOOL loop);	FMOD_RESULT F_API FMOD_System_RecordStart (FMOD_SYSTEM system, int id, FMOD_SOUND sound, FMOD_BOOL loop);
	FMOD_RESULT F_API FMOD_System_RecordStop (FMOD_SYSTEM *system, int id);	FMOD_RESULT F_API FMOD_System_RecordStop (FMOD_SYSTEM *system, int id);
	FMOD_RESULT F_API FMOD_System_IsRecording (FMOD_SYSTEM system, int id, FMOD_BOOL recording);	FMOD_RESULT F_API FMOD_System_IsRecording (FMOD_SYSTEM system, int id, FMOD_BOOL recording);

	/*	/*
	Geometry API.	Geometry API.
	*/	*/

	skipping to change at line 1971	skipping to change at line 1976
	FMOD_RESULT F_API FMOD_System_SetNetworkTimeout (FMOD_SYSTEM *system, int timeout);	FMOD_RESULT F_API FMOD_System_SetNetworkTimeout (FMOD_SYSTEM *system, int timeout);
	FMOD_RESULT F_API FMOD_System_GetNetworkTimeout (FMOD_SYSTEM system, int timeout);	FMOD_RESULT F_API FMOD_System_GetNetworkTimeout (FMOD_SYSTEM system, int timeout);

	/*	/*
	Userdata set/get.	Userdata set/get.
	*/	*/

	FMOD_RESULT F_API FMOD_System_SetUserData (FMOD_SYSTEM system, void userdata);	FMOD_RESULT F_API FMOD_System_SetUserData (FMOD_SYSTEM system, void userdata);
	FMOD_RESULT F_API FMOD_System_GetUserData (FMOD_SYSTEM system, void *userdata);	FMOD_RESULT F_API FMOD_System_GetUserData (FMOD_SYSTEM system, void *userdata);


	FMOD_RESULT F_API FMOD_System_GetMemoryInfo (FMOD_SYSTEM system, unsigned int memorybits, unsigned int event_memorybits, unsigned int memor yused, unsigned int *memoryused_array);	FMOD_RESULT F_API FMOD_System_GetMemoryInfo (FMOD_SYSTEM system, unsigned int memorybits, unsigned int event_memorybits, unsigned int memor yused, FMOD_MEMORY_USAGE_DETAILS *memoryused_details);

	/*	/*
	'Sound' API	'Sound' API
	*/	*/

	FMOD_RESULT F_API FMOD_Sound_Release (FMOD_SOUND *sound);	FMOD_RESULT F_API FMOD_Sound_Release (FMOD_SOUND *sound);
	FMOD_RESULT F_API FMOD_Sound_GetSystemObject (FMOD_SOUND sound, FM OD_SYSTEM *system);	FMOD_RESULT F_API FMOD_Sound_GetSystemObject (FMOD_SOUND sound, FM OD_SYSTEM *system);

	/*	/*
	Standard sound manipulation functions.	Standard sound manipulation functions.

	skipping to change at line 2048	skipping to change at line 2053
	FMOD_RESULT F_API FMOD_Sound_SetMusicChannelVolume (FMOD_SOUND *sound, in t channel, float volume);	FMOD_RESULT F_API FMOD_Sound_SetMusicChannelVolume (FMOD_SOUND *sound, in t channel, float volume);
	FMOD_RESULT F_API FMOD_Sound_GetMusicChannelVolume (FMOD_SOUND sound, in t channel, float volume);	FMOD_RESULT F_API FMOD_Sound_GetMusicChannelVolume (FMOD_SOUND sound, in t channel, float volume);

	/*	/*
	Userdata set/get.	Userdata set/get.
	*/	*/

	FMOD_RESULT F_API FMOD_Sound_SetUserData (FMOD_SOUND sound, vo id userdata);	FMOD_RESULT F_API FMOD_Sound_SetUserData (FMOD_SOUND sound, vo id userdata);
	FMOD_RESULT F_API FMOD_Sound_GetUserData (FMOD_SOUND sound, vo id *userdata);	FMOD_RESULT F_API FMOD_Sound_GetUserData (FMOD_SOUND sound, vo id *userdata);


	FMOD_RESULT F_API FMOD_Sound_GetMemoryInfo (FMOD_SOUND sound, un signed int memorybits, unsigned int event_memorybits, unsigned int memoryu sed, unsigned int *memoryused_array);	FMOD_RESULT F_API FMOD_Sound_GetMemoryInfo (FMOD_SOUND sound, un signed int memorybits, unsigned int event_memorybits, unsigned int memoryu sed, FMOD_MEMORY_USAGE_DETAILS *memoryused_details);

	/*	/*
	'Channel' API	'Channel' API
	*/	*/

	FMOD_RESULT F_API FMOD_Channel_GetSystemObject (FMOD_CHANNEL channel , FMOD_SYSTEM *system);	FMOD_RESULT F_API FMOD_Channel_GetSystemObject (FMOD_CHANNEL channel , FMOD_SYSTEM *system);

	FMOD_RESULT F_API FMOD_Channel_Stop (FMOD_CHANNEL *channel );	FMOD_RESULT F_API FMOD_Channel_Stop (FMOD_CHANNEL *channel );
	FMOD_RESULT F_API FMOD_Channel_SetPaused (FMOD_CHANNEL *channel , FMOD_BOOL paused);	FMOD_RESULT F_API FMOD_Channel_SetPaused (FMOD_CHANNEL *channel , FMOD_BOOL paused);
	FMOD_RESULT F_API FMOD_Channel_GetPaused (FMOD_CHANNEL channel , FMOD_BOOL paused);	FMOD_RESULT F_API FMOD_Channel_GetPaused (FMOD_CHANNEL channel , FMOD_BOOL paused);

	skipping to change at line 2148	skipping to change at line 2153
	FMOD_RESULT F_API FMOD_Channel_SetLoopPoints (FMOD_CHANNEL *channel , unsigned int loopstart, FMOD_TIMEUNIT loopstarttype, unsigned int loopend , FMOD_TIMEUNIT loopendtype);	FMOD_RESULT F_API FMOD_Channel_SetLoopPoints (FMOD_CHANNEL *channel , unsigned int loopstart, FMOD_TIMEUNIT loopstarttype, unsigned int loopend , FMOD_TIMEUNIT loopendtype);
	FMOD_RESULT F_API FMOD_Channel_GetLoopPoints (FMOD_CHANNEL channel , unsigned int loopstart, FMOD_TIMEUNIT loopstarttype, unsigned int *loope nd, FMOD_TIMEUNIT loopendtype);	FMOD_RESULT F_API FMOD_Channel_GetLoopPoints (FMOD_CHANNEL channel , unsigned int loopstart, FMOD_TIMEUNIT loopstarttype, unsigned int *loope nd, FMOD_TIMEUNIT loopendtype);

	/*	/*
	Userdata set/get.	Userdata set/get.
	*/	*/

	FMOD_RESULT F_API FMOD_Channel_SetUserData (FMOD_CHANNEL channel , void userdata);	FMOD_RESULT F_API FMOD_Channel_SetUserData (FMOD_CHANNEL channel , void userdata);
	FMOD_RESULT F_API FMOD_Channel_GetUserData (FMOD_CHANNEL channel , void *userdata);	FMOD_RESULT F_API FMOD_Channel_GetUserData (FMOD_CHANNEL channel , void *userdata);


	FMOD_RESULT F_API FMOD_Channel_GetMemoryInfo (FMOD_CHANNEL channel , unsigned int memorybits, unsigned int event_memorybits, unsigned int mem oryused, unsigned int *memoryused_array);	FMOD_RESULT F_API FMOD_Channel_GetMemoryInfo (FMOD_CHANNEL channel , unsigned int memorybits, unsigned int event_memorybits, unsigned int mem oryused, FMOD_MEMORY_USAGE_DETAILS *memoryused_details);

	/*	/*
	'ChannelGroup' API	'ChannelGroup' API
	*/	*/

	FMOD_RESULT F_API FMOD_ChannelGroup_Release (FMOD_CHANNELGROUP *ch annelgroup);	FMOD_RESULT F_API FMOD_ChannelGroup_Release (FMOD_CHANNELGROUP *ch annelgroup);
	FMOD_RESULT F_API FMOD_ChannelGroup_GetSystemObject (FMOD_CHANNELGROUP ch annelgroup, FMOD_SYSTEM *system);	FMOD_RESULT F_API FMOD_ChannelGroup_GetSystemObject (FMOD_CHANNELGROUP ch annelgroup, FMOD_SYSTEM *system);

	/*	/*
	Channelgroup scale values. (changes attributes relative to the channe ls, doesn't overwrite them)	Channelgroup scale values. (changes attributes relative to the channe ls, doesn't overwrite them)

	skipping to change at line 2217	skipping to change at line 2222
	FMOD_RESULT F_API FMOD_ChannelGroup_GetSpectrum (FMOD_CHANNELGROUP ch annelgroup, float spectrumarray, int numvalues, int channeloffset, FMOD_DS P_FFT_WINDOW windowtype);	FMOD_RESULT F_API FMOD_ChannelGroup_GetSpectrum (FMOD_CHANNELGROUP ch annelgroup, float spectrumarray, int numvalues, int channeloffset, FMOD_DS P_FFT_WINDOW windowtype);
	FMOD_RESULT F_API FMOD_ChannelGroup_GetWaveData (FMOD_CHANNELGROUP ch annelgroup, float wavearray, int numvalues, int channeloffset);	FMOD_RESULT F_API FMOD_ChannelGroup_GetWaveData (FMOD_CHANNELGROUP ch annelgroup, float wavearray, int numvalues, int channeloffset);

	/*	/*
	Userdata set/get.	Userdata set/get.
	*/	*/

	FMOD_RESULT F_API FMOD_ChannelGroup_SetUserData (FMOD_CHANNELGROUP ch annelgroup, void userdata);	FMOD_RESULT F_API FMOD_ChannelGroup_SetUserData (FMOD_CHANNELGROUP ch annelgroup, void userdata);
	FMOD_RESULT F_API FMOD_ChannelGroup_GetUserData (FMOD_CHANNELGROUP ch annelgroup, void *userdata);	FMOD_RESULT F_API FMOD_ChannelGroup_GetUserData (FMOD_CHANNELGROUP ch annelgroup, void *userdata);


	FMOD_RESULT F_API FMOD_ChannelGroup_GetMemoryInfo (FMOD_CHANNELGROUP ch annelgroup, unsigned int memorybits, unsigned int event_memorybits, unsigne d int memoryused, unsigned int *memoryused_array);	FMOD_RESULT F_API FMOD_ChannelGroup_GetMemoryInfo (FMOD_CHANNELGROUP ch annelgroup, unsigned int memorybits, unsigned int event_memorybits, unsigne d int memoryused, FMOD_MEMORY_USAGE_DETAILS *memoryused_details);

	/*	/*
	'SoundGroup' API	'SoundGroup' API
	*/	*/

	FMOD_RESULT F_API FMOD_SoundGroup_Release (FMOD_SOUNDGROUP *soun dgroup);	FMOD_RESULT F_API FMOD_SoundGroup_Release (FMOD_SOUNDGROUP *soun dgroup);
	FMOD_RESULT F_API FMOD_SoundGroup_GetSystemObject (FMOD_SOUNDGROUP soun dgroup, FMOD_SYSTEM *system);	FMOD_RESULT F_API FMOD_SoundGroup_GetSystemObject (FMOD_SOUNDGROUP soun dgroup, FMOD_SYSTEM *system);

	/*	/*
	SoundGroup control functions.	SoundGroup control functions.

	skipping to change at line 2256	skipping to change at line 2261
	FMOD_RESULT F_API FMOD_SoundGroup_GetSound (FMOD_SOUNDGROUP soun dgroup, int index, FMOD_SOUND *sound);	FMOD_RESULT F_API FMOD_SoundGroup_GetSound (FMOD_SOUNDGROUP soun dgroup, int index, FMOD_SOUND *sound);
	FMOD_RESULT F_API FMOD_SoundGroup_GetNumPlaying (FMOD_SOUNDGROUP soun dgroup, int numplaying);	FMOD_RESULT F_API FMOD_SoundGroup_GetNumPlaying (FMOD_SOUNDGROUP soun dgroup, int numplaying);

	/*	/*
	Userdata set/get.	Userdata set/get.
	*/	*/

	FMOD_RESULT F_API FMOD_SoundGroup_SetUserData (FMOD_SOUNDGROUP soun dgroup, void userdata);	FMOD_RESULT F_API FMOD_SoundGroup_SetUserData (FMOD_SOUNDGROUP soun dgroup, void userdata);
	FMOD_RESULT F_API FMOD_SoundGroup_GetUserData (FMOD_SOUNDGROUP soun dgroup, void *userdata);	FMOD_RESULT F_API FMOD_SoundGroup_GetUserData (FMOD_SOUNDGROUP soun dgroup, void *userdata);


	FMOD_RESULT F_API FMOD_SoundGroup_GetMemoryInfo (FMOD_SOUNDGROUP soun dgroup, unsigned int memorybits, unsigned int event_memorybits, unsigned in t memoryused, unsigned int *memoryused_array);	FMOD_RESULT F_API FMOD_SoundGroup_GetMemoryInfo (FMOD_SOUNDGROUP soun dgroup, unsigned int memorybits, unsigned int event_memorybits, unsigned in t memoryused, FMOD_MEMORY_USAGE_DETAILS *memoryused_details);

	/*	/*
	'DSP' API	'DSP' API
	*/	*/

	FMOD_RESULT F_API FMOD_DSP_Release (FMOD_DSP *dsp);	FMOD_RESULT F_API FMOD_DSP_Release (FMOD_DSP *dsp);
	FMOD_RESULT F_API FMOD_DSP_GetSystemObject (FMOD_DSP dsp, FMOD_S YSTEM *system);	FMOD_RESULT F_API FMOD_DSP_GetSystemObject (FMOD_DSP dsp, FMOD_S YSTEM *system);

	/*	/*
	Connection / disconnection / input and output enumeration.	Connection / disconnection / input and output enumeration.

	skipping to change at line 2316	skipping to change at line 2321
	FMOD_RESULT F_API FMOD_DSP_SetDefaults (FMOD_DSP *dsp, float frequency, float volume, float pan, int priority);	FMOD_RESULT F_API FMOD_DSP_SetDefaults (FMOD_DSP *dsp, float frequency, float volume, float pan, int priority);
	FMOD_RESULT F_API FMOD_DSP_GetDefaults (FMOD_DSP dsp, float frequency, float volume, float pan, int *priority);	FMOD_RESULT F_API FMOD_DSP_GetDefaults (FMOD_DSP dsp, float frequency, float volume, float pan, int *priority);

	/*	/*
	Userdata set/get.	Userdata set/get.
	*/	*/

	FMOD_RESULT F_API FMOD_DSP_SetUserData (FMOD_DSP dsp, void userdata);	FMOD_RESULT F_API FMOD_DSP_SetUserData (FMOD_DSP dsp, void userdata);
	FMOD_RESULT F_API FMOD_DSP_GetUserData (FMOD_DSP dsp, void *userdata);	FMOD_RESULT F_API FMOD_DSP_GetUserData (FMOD_DSP dsp, void *userdata);


	FMOD_RESULT F_API FMOD_DSP_GetMemoryInfo (FMOD_DSP dsp, unsign ed int memorybits, unsigned int event_memorybits, unsigned int memoryused, unsigned int *memoryused_array);	FMOD_RESULT F_API FMOD_DSP_GetMemoryInfo (FMOD_DSP dsp, unsign ed int memorybits, unsigned int event_memorybits, unsigned int memoryused, FMOD_MEMORY_USAGE_DETAILS *memoryused_details);

	/*	/*
	'DSPConnection' API	'DSPConnection' API
	*/	*/

	FMOD_RESULT F_API FMOD_DSPConnection_GetInput (FMOD_DSPCONNECTION d spconnection, FMOD_DSP *input);	FMOD_RESULT F_API FMOD_DSPConnection_GetInput (FMOD_DSPCONNECTION d spconnection, FMOD_DSP *input);
	FMOD_RESULT F_API FMOD_DSPConnection_GetOutput (FMOD_DSPCONNECTION d spconnection, FMOD_DSP *output);	FMOD_RESULT F_API FMOD_DSPConnection_GetOutput (FMOD_DSPCONNECTION d spconnection, FMOD_DSP *output);
	FMOD_RESULT F_API FMOD_DSPConnection_SetMix (FMOD_DSPCONNECTION *d spconnection, float volume);	FMOD_RESULT F_API FMOD_DSPConnection_SetMix (FMOD_DSPCONNECTION *d spconnection, float volume);
	FMOD_RESULT F_API FMOD_DSPConnection_GetMix (FMOD_DSPCONNECTION d spconnection, float volume);	FMOD_RESULT F_API FMOD_DSPConnection_GetMix (FMOD_DSPCONNECTION d spconnection, float volume);
	FMOD_RESULT F_API FMOD_DSPConnection_SetLevels (FMOD_DSPCONNECTION d spconnection, FMOD_SPEAKER speaker, float levels, int numlevels);	FMOD_RESULT F_API FMOD_DSPConnection_SetLevels (FMOD_DSPCONNECTION d spconnection, FMOD_SPEAKER speaker, float levels, int numlevels);
	FMOD_RESULT F_API FMOD_DSPConnection_GetLevels (FMOD_DSPCONNECTION d spconnection, FMOD_SPEAKER speaker, float levels, int numlevels);	FMOD_RESULT F_API FMOD_DSPConnection_GetLevels (FMOD_DSPCONNECTION d spconnection, FMOD_SPEAKER speaker, float levels, int numlevels);

	/*	/*
	Userdata set/get.	Userdata set/get.
	*/	*/

	FMOD_RESULT F_API FMOD_DSPConnection_SetUserData (FMOD_DSPCONNECTION d spconnection, void userdata);	FMOD_RESULT F_API FMOD_DSPConnection_SetUserData (FMOD_DSPCONNECTION d spconnection, void userdata);
	FMOD_RESULT F_API FMOD_DSPConnection_GetUserData (FMOD_DSPCONNECTION d spconnection, void *userdata);	FMOD_RESULT F_API FMOD_DSPConnection_GetUserData (FMOD_DSPCONNECTION d spconnection, void *userdata);


	FMOD_RESULT F_API FMOD_DSPConnection_GetMemoryInfo (FMOD_DSPCONNECTION d spconnection, unsigned int memorybits, unsigned int event_memorybits, unsig ned int memoryused, unsigned int *memoryused_array);	FMOD_RESULT F_API FMOD_DSPConnection_GetMemoryInfo (FMOD_DSPCONNECTION d spconnection, unsigned int memorybits, unsigned int event_memorybits, unsig ned int memoryused, FMOD_MEMORY_USAGE_DETAILS *memoryused_details);

	/*	/*
	'Geometry' API	'Geometry' API
	*/	*/

	FMOD_RESULT F_API FMOD_Geometry_Release (FMOD_GEOMETRY *geomet ry);	FMOD_RESULT F_API FMOD_Geometry_Release (FMOD_GEOMETRY *geomet ry);

	/*	/*
	Polygon manipulation.	Polygon manipulation.
	*/	*/

	skipping to change at line 2378	skipping to change at line 2383
	FMOD_RESULT F_API FMOD_Geometry_GetScale (FMOD_GEOMETRY geomet ry, FMOD_VECTOR scale);	FMOD_RESULT F_API FMOD_Geometry_GetScale (FMOD_GEOMETRY geomet ry, FMOD_VECTOR scale);
	FMOD_RESULT F_API FMOD_Geometry_Save (FMOD_GEOMETRY geomet ry, void data, int *datasize);	FMOD_RESULT F_API FMOD_Geometry_Save (FMOD_GEOMETRY geomet ry, void data, int *datasize);

	/*	/*
	Userdata set/get.	Userdata set/get.
	*/	*/

	FMOD_RESULT F_API FMOD_Geometry_SetUserData (FMOD_GEOMETRY geomet ry, void userdata);	FMOD_RESULT F_API FMOD_Geometry_SetUserData (FMOD_GEOMETRY geomet ry, void userdata);
	FMOD_RESULT F_API FMOD_Geometry_GetUserData (FMOD_GEOMETRY geomet ry, void *userdata);	FMOD_RESULT F_API FMOD_Geometry_GetUserData (FMOD_GEOMETRY geomet ry, void *userdata);


	FMOD_RESULT F_API FMOD_Geometry_GetMemoryInfo (FMOD_GEOMETRY geomet ry, unsigned int memorybits, unsigned int event_memorybits, unsigned int m emoryused, unsigned int *memoryused_array);	FMOD_RESULT F_API FMOD_Geometry_GetMemoryInfo (FMOD_GEOMETRY geomet ry, unsigned int memorybits, unsigned int event_memorybits, unsigned int m emoryused, FMOD_MEMORY_USAGE_DETAILS *memoryused_details);

	/*	/*
	'Reverb' API	'Reverb' API
	*/	*/

	FMOD_RESULT F_API FMOD_Reverb_Release (FMOD_REVERB *reverb);	FMOD_RESULT F_API FMOD_Reverb_Release (FMOD_REVERB *reverb);

	/*	/*
	Reverb manipulation.	Reverb manipulation.
	*/	*/

	skipping to change at line 2404	skipping to change at line 2409
	FMOD_RESULT F_API FMOD_Reverb_SetActive (FMOD_REVERB *reverb, FMOD_BOOL active);	FMOD_RESULT F_API FMOD_Reverb_SetActive (FMOD_REVERB *reverb, FMOD_BOOL active);
	FMOD_RESULT F_API FMOD_Reverb_GetActive (FMOD_REVERB reverb, FMOD_BOOL active);	FMOD_RESULT F_API FMOD_Reverb_GetActive (FMOD_REVERB reverb, FMOD_BOOL active);

	/*	/*
	Userdata set/get.	Userdata set/get.
	*/	*/

	FMOD_RESULT F_API FMOD_Reverb_SetUserData (FMOD_REVERB reverb, void userdata);	FMOD_RESULT F_API FMOD_Reverb_SetUserData (FMOD_REVERB reverb, void userdata);
	FMOD_RESULT F_API FMOD_Reverb_GetUserData (FMOD_REVERB reverb, void *userdata);	FMOD_RESULT F_API FMOD_Reverb_GetUserData (FMOD_REVERB reverb, void *userdata);


	FMOD_RESULT F_API FMOD_Reverb_GetMemoryInfo (FMOD_REVERB reverb, unsigned int memorybits, unsigned int event_memorybits, unsigned int memor yused, unsigned int *memoryused_array);	FMOD_RESULT F_API FMOD_Reverb_GetMemoryInfo (FMOD_REVERB reverb, unsigned int memorybits, unsigned int event_memorybits, unsigned int memor yused, FMOD_MEMORY_USAGE_DETAILS *memoryused_details);
	/$ preserve start $/	/$ preserve start $/

	#ifdef __cplusplus	#ifdef __cplusplus
	}	}
	#endif	#endif

	#endif	#endif

	/$ preserve end $/	/$ preserve end $/

End of changes. 26 change blocks.
	100 lines changed or deleted	114 lines changed or added

	fmod_event_net.h	fmod_event_net.h

	skipping to change at line 21	skipping to change at line 21
	#define __FMOD_EVENT_NET_H__	#define __FMOD_EVENT_NET_H__

	#ifndef __FMOD_EVENT_H__	#ifndef __FMOD_EVENT_H__
	#include "fmod_event.h"	#include "fmod_event.h"
	#endif	#endif

	/*	/*
	FMOD NetEventSystem version number. Check this against NetEventSystem_ GetVersion.	FMOD NetEventSystem version number. Check this against NetEventSystem_ GetVersion.
	0xaaaabbcc -> aaaa = major version number. bb = minor version number. cc = development version number.	0xaaaabbcc -> aaaa = major version number. bb = minor version number. cc = development version number.
	*/	*/

	#define FMOD_EVENT_NET_VERSION 0x00042806	#define FMOD_EVENT_NET_VERSION 0x00043005

	/*	/*
	Default port that the target (game) will listen on	Default port that the target (game) will listen on
	*/	*/
	#define FMOD_EVENT_NET_PORT 17997	#define FMOD_EVENT_NET_PORT 17997

	#ifdef __cplusplus	#ifdef __cplusplus
	extern "C"	extern "C"
	{	{
	#endif	#endif

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	fmod_memoryinfo.h	fmod_memoryinfo.h

	skipping to change at line 13	skipping to change at line 13
	/* */	/* */
	/* Use this header if you are interested in getting detailed information on FMOD's memory */	/* Use this header if you are interested in getting detailed information on FMOD's memory */
	/* usage. See the documentation for more details. */	/* usage. See the documentation for more details. */
	/* */	/* */
	/* ======================================================================== ===================== */	/* ======================================================================== ===================== */

	#ifndef _FMOD_MEMORYINFO_H	#ifndef _FMOD_MEMORYINFO_H
	#define _FMOD_MEMORYINFO_H	#define _FMOD_MEMORYINFO_H

	/*	/*

	[ENUM]	[STRUCTURE]
	[	[
	[DESCRIPTION]	[DESCRIPTION]

	Description of "memoryused_array" fields returned by the getMemoryInfo function of every public FMOD class.	Structure to be filled with detailed memory usage information of an FMO D object

	[REMARKS]	[REMARKS]
	Every public FMOD class has a getMemoryInfo function which can be used to get detailed information on what memory resources are associated with th e object in question.	Every public FMOD class has a getMemoryInfo function which can be used to get detailed information on what memory resources are associated with th e object in question.

	The FMOD_MEMTYPE enumeration values can be used to address the "memoryu	On return from getMemoryInfo, each member of this structure will hold t
	sed_array" returned by getMemoryInfo. See System::getMemoryInfo for an exam	he amount of memory used for its type in bytes.<br>
	ple.	<br>
		Members marked with [in] mean the user sets the value before passing it
		to the function.<br>
		Members marked with [out] mean FMOD sets the value to be used after the
		function exits.<br>

	[PLATFORMS]	[PLATFORMS]

	Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation 2, PlaySt ation Portable, PlayStation 3, Wii, Solaris, iPhone	Win32, Win64, Linux, Linux64, Macintosh, Xbox, Xbox360, PlayStation 2, GameCube, PlayStation Portable, PlayStation 3

	[SEE_ALSO]	[SEE_ALSO]
	System::getMemoryInfo	System::getMemoryInfo
	EventSystem::getMemoryInfo	EventSystem::getMemoryInfo
	FMOD_MEMBITS	FMOD_MEMBITS
	FMOD_EVENT_MEMBITS	FMOD_EVENT_MEMBITS
	]	]
	*/	*/

	typedef enum	typedef struct FMOD_MEMORY_USAGE_DETAILS
	{	{

	FMOD_MEMTYPE_OTHER = 0, /* Memory not accounted fo	unsigned int other; /* [out] Memory not accoun
	r by other types */	ted for by other types */
	FMOD_MEMTYPE_STRING = 1, /* String data */	unsigned int string; /* [out] String data */
		unsigned int system; /* [out] System object and
	FMOD_MEMTYPE_SYSTEM = 2, /* System object and vario	various internals */
	us internals */	unsigned int plugins; /* [out] Plugin objects an
	FMOD_MEMTYPE_PLUGINS = 3, /* Plugin objects and inte	d internals */
	rnals */	unsigned int output; /* [out] Output module obj
	FMOD_MEMTYPE_OUTPUT = 4, /* Output module object an	ect and internals */
	d internals */	unsigned int channel; /* [out] Channel related m
	FMOD_MEMTYPE_CHANNEL = 5, /* Channel related memory	emory */
	*/	unsigned int channelgroup; /* [out] ChannelGroup obje
	FMOD_MEMTYPE_CHANNELGROUP = 6, /* ChannelGroup objects an	cts and internals */
	d internals */	unsigned int codec; /* [out] Codecs allocated
	FMOD_MEMTYPE_CODEC = 7, /* Codecs allocated for st	for streaming */
	reaming */	unsigned int file; /* [out] File buffers and
	FMOD_MEMTYPE_FILE = 8, /* File buffers and struct	structures */
	ures */	unsigned int sound; /* [out] Sound objects and
	FMOD_MEMTYPE_SOUND = 9, /* Sound objects and inter	internals */
	nals */	unsigned int secondaryram; /* [out] Sound data stored
	FMOD_MEMTYPE_SOUND_SECONDARYRAM = 10, /* Sound data stored in se	in secondary RAM */
	condary RAM */	unsigned int soundgroup; /* [out] SoundGroup object
	FMOD_MEMTYPE_SOUNDGROUP = 11, /* SoundGroup objects and	s and internals */
	internals */	unsigned int streambuffer; /* [out] Stream buffer mem
	FMOD_MEMTYPE_STREAMBUFFER = 12, /* Stream buffer memory */	ory */
	FMOD_MEMTYPE_DSPCONNECTION = 13, /* DSPConnection objects a	unsigned int dspconnection; /* [out] DSPConnection obj
	nd internals */	ects and internals */
	FMOD_MEMTYPE_DSP = 14, /* DSP implementation obje	unsigned int dsp; /* [out] DSP implementatio
	cts */	n objects */
	FMOD_MEMTYPE_DSPCODEC = 15, /* Realtime file format de	unsigned int dspcodec; /* [out] Realtime file for
	coding DSP objects */	mat decoding DSP objects */
	FMOD_MEMTYPE_PROFILE = 16, /* Profiler memory footpri	unsigned int profile; /* [out] Profiler memory f
	nt. */	ootprint. */
	FMOD_MEMTYPE_RECORDBUFFER = 17, /* Buffer used to store re	unsigned int recordbuffer; /* [out] Buffer used to st
	corded data from microphone */	ore recorded data from microphone */
	FMOD_MEMTYPE_REVERB = 18, /* Reverb implementation o	unsigned int reverb; /* [out] Reverb implementa
	bjects */	tion objects */
	FMOD_MEMTYPE_REVERBCHANNELPROPS = 19, /* Reverb channel properti	unsigned int reverbchannelprops; /* [out] Reverb channel pr
	es structs */	operties structs */
	FMOD_MEMTYPE_GEOMETRY = 20, /* Geometry objects and in	unsigned int geometry; /* [out] Geometry objects
	ternals */	and internals */
	FMOD_MEMTYPE_SYNCPOINT = 21, /* Sync point memory. */	unsigned int syncpoint; /* [out] Sync point memory
		. */
	FMOD_MEMTYPE_EVENTSYSTEM = 22, /* EventSystem and various	unsigned int eventsystem; /* [out] EventSystem and v
	internals */	arious internals */
	FMOD_MEMTYPE_MUSICSYSTEM = 23, /* MusicSystem and various	unsigned int musicsystem; /* [out] MusicSystem and v
	internals */	arious internals */
	FMOD_MEMTYPE_FEV = 24, /* Definition of objects c	unsigned int fev; /* [out] Definition of obj
	ontained in all loaded projects e.g. events, groups, categories */	ects contained in all loaded projects e.g. events, groups, categories */
	FMOD_MEMTYPE_MEMORYFSB = 25, /* Data loaded with regist	unsigned int memoryfsb; /* [out] Data loaded with
	erMemoryFSB */	registerMemoryFSB */
	FMOD_MEMTYPE_EVENTPROJECT = 26, /* EventProject objects an	unsigned int eventproject; /* [out] EventProject obje
	d internals */	cts and internals */
	FMOD_MEMTYPE_EVENTGROUPI = 27, /* EventGroup objects and	unsigned int eventgroupi; /* [out] EventGroup object
	internals */	s and internals */
	FMOD_MEMTYPE_SOUNDBANKCLASS = 28, /* Objects used to manage	unsigned int soundbankclass; /* [out] Objects used to m
	wave banks */	anage wave banks */
	FMOD_MEMTYPE_SOUNDBANKLIST = 29, /* Data used to manage lis	unsigned int soundbanklist; /* [out] Data used to mana
	ts of wave bank usage */	ge lists of wave bank usage */
	FMOD_MEMTYPE_STREAMINSTANCE = 30, /* Stream objects and inte	unsigned int streaminstance; /* [out] Stream objects an
	rnals */	d internals */
	FMOD_MEMTYPE_SOUNDDEFCLASS = 31, /* Sound definition object	unsigned int sounddefclass; /* [out] Sound definition
	s */	objects */
	FMOD_MEMTYPE_SOUNDDEFDEFCLASS = 32, /* Sound definition static	unsigned int sounddefdefclass; /* [out] Sound definition
	data objects */	static data objects */
	FMOD_MEMTYPE_SOUNDDEFPOOL = 33, /* Sound definition pool d	unsigned int sounddefpool; /* [out] Sound definition
	ata */	pool data */
	FMOD_MEMTYPE_REVERBDEF = 34, /* Reverb definition objec	unsigned int reverbdef; /* [out] Reverb definition
	ts */	objects */
	FMOD_MEMTYPE_EVENTREVERB = 35, /* Reverb objects */	unsigned int eventreverb; /* [out] Reverb objects */
	FMOD_MEMTYPE_USERPROPERTY = 36, /* User property objects *	unsigned int userproperty; /* [out] User property obj
	/	ects */
	FMOD_MEMTYPE_EVENTINSTANCE = 37, /* Event instance base obj	unsigned int eventinstance; /* [out] Event instance ba
	ects */	se objects */
	FMOD_MEMTYPE_EVENTINSTANCE_COMPLEX = 38, /* Complex event instance	unsigned int eventinstance_complex; /* [out] Complex event ins
	objects */	tance objects */
	FMOD_MEMTYPE_EVENTINSTANCE_SIMPLE = 39, /* Simple event instance o	unsigned int eventinstance_simple; /* [out] Simple event inst
	bjects */	ance objects */
	FMOD_MEMTYPE_EVENTINSTANCE_LAYER = 40, /* Event layer instance ob	unsigned int eventinstance_layer; /* [out] Event layer insta
	jects */	nce objects */
	FMOD_MEMTYPE_EVENTINSTANCE_SOUND = 41, /* Event sound instance ob	unsigned int eventinstance_sound; /* [out] Event sound insta
	jects */	nce objects */
	FMOD_MEMTYPE_EVENTENVELOPE = 42, /* Event envelope objects	unsigned int eventenvelope; /* [out] Event envelope ob
	*/	jects */
	FMOD_MEMTYPE_EVENTENVELOPEDEF = 43, /* Event envelope definiti	unsigned int eventenvelopedef; /* [out] Event envelope de
	on objects */	finition objects */
	FMOD_MEMTYPE_EVENTPARAMETER = 44, /* Event parameter objects	unsigned int eventparameter; /* [out] Event parameter o
	*/	bjects */
	FMOD_MEMTYPE_EVENTCATEGORY = 45, /* Event category objects	unsigned int eventcategory; /* [out] Event category ob
	*/	jects */
	FMOD_MEMTYPE_EVENTENVELOPEPOINT = 46, /* Event envelope point ob	unsigned int eventenvelopepoint; /* [out] Event envelope po
	jects */	int objects */
	FMOD_MEMTYPE_EVENTINSTANCEPOOL = 47, /* Event instance pool mem	unsigned int eventinstancepool; /* [out] Event instance po
	ory */	ol memory */
		} FMOD_MEMORY_USAGE_DETAILS;
	FMOD_MEMTYPE_MAX, /* Number of "memoryused_a
	rray" fields. */
	FMOD_MEMTYPE_FORCEINT = 65536 /* Makes sure this enum is
	signed 32bit */

	} FMOD_MEMTYPE;

	/*	/*
	[DEFINE]	[DEFINE]
	[	[
	[NAME]	[NAME]
	FMOD_MEMBITS	FMOD_MEMBITS

	[DESCRIPTION]	[DESCRIPTION]
	Bitfield used to request specific memory usage information from the get MemoryInfo function of every public FMOD Ex class.	Bitfield used to request specific memory usage information from the get MemoryInfo function of every public FMOD Ex class.
	Use with the "memorybits" parameter of getMemoryInfo to get information on FMOD Ex memory usage.	Use with the "memorybits" parameter of getMemoryInfo to get information on FMOD Ex memory usage.

	skipping to change at line 112	skipping to change at line 109
	The FMOD_MEMBITS defines can be OR'd together to specify precisely what memory usage you'd like to get information on. See System::getMemoryInfo f or an example.	The FMOD_MEMBITS defines can be OR'd together to specify precisely what memory usage you'd like to get information on. See System::getMemoryInfo f or an example.

	[PLATFORMS]	[PLATFORMS]
	Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation 2, PlaySt ation Portable, PlayStation 3, Wii, Solaris, iPhone	Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation 2, PlaySt ation Portable, PlayStation 3, Wii, Solaris, iPhone

	[SEE_ALSO]	[SEE_ALSO]
	FMOD_EVENT_MEMBITS	FMOD_EVENT_MEMBITS
	System::getMemoryInfo	System::getMemoryInfo
	]	]
	*/	*/

	#define FMOD_MEMBITS_OTHER (1 << FMOD_MEMTYPE_OTHER)	#define FMOD_MEMBITS_OTHER 0x00000001 /* Memory not
	/* Memory not accounted for by other types */	accounted for by other types */
	#define FMOD_MEMBITS_STRING (1 << FMOD_MEMTYPE_STRING)	#define FMOD_MEMBITS_STRING 0x00000002 /* String data
	/* String data */	*/


	#define FMOD_MEMBITS_SYSTEM (1 << FMOD_MEMTYPE_SYSTEM)	#define FMOD_MEMBITS_SYSTEM 0x00000004 /* System obje
	/* System object and various internals */	ct and various internals */
	#define FMOD_MEMBITS_PLUGINS (1 << FMOD_MEMTYPE_PLUGINS	#define FMOD_MEMBITS_PLUGINS 0x00000008 /* Plugin obje
	) /* Plugin objects and internals */	cts and internals */
	#define FMOD_MEMBITS_OUTPUT (1 << FMOD_MEMTYPE_OUTPUT)	#define FMOD_MEMBITS_OUTPUT 0x00000010 /* Output modu
	/* Output module object and internals */	le object and internals */
	#define FMOD_MEMBITS_CHANNEL (1 << FMOD_MEMTYPE_CHANNEL	#define FMOD_MEMBITS_CHANNEL 0x00000020 /* Channel rel
	) /* Channel related memory */	ated memory */
	#define FMOD_MEMBITS_CHANNELGROUP (1 << FMOD_MEMTYPE_CHANNEL	#define FMOD_MEMBITS_CHANNELGROUP 0x00000040 /* ChannelGrou
	GROUP) /* ChannelGroup objects and internals */	p objects and internals */
	#define FMOD_MEMBITS_CODEC (1 << FMOD_MEMTYPE_CODEC)	#define FMOD_MEMBITS_CODEC 0x00000080 /* Codecs allo
	/* Codecs allocated for streaming */	cated for streaming */
	#define FMOD_MEMBITS_FILE (1 << FMOD_MEMTYPE_FILE)	#define FMOD_MEMBITS_FILE 0x00000100 /* Codecs allo
	/* Codecs allocated for streaming */	cated for streaming */
	#define FMOD_MEMBITS_SOUND (1 << FMOD_MEMTYPE_SOUND)	#define FMOD_MEMBITS_SOUND 0x00000200 /* Sound objec
	/* Sound objects and internals */	ts and internals */
	#define FMOD_MEMBITS_SOUND_SECONDARYRAM (1 << FMOD_MEMTYPE_SOUND_S	#define FMOD_MEMBITS_SOUND_SECONDARYRAM 0x00000400 /* Sound data
	ECONDARYRAM) /* Sound data stored in secondary RAM */	stored in secondary RAM */
	#define FMOD_MEMBITS_SOUNDGROUP (1 << FMOD_MEMTYPE_SOUNDGR	#define FMOD_MEMBITS_SOUNDGROUP 0x00000800 /* SoundGroup
	OUP) /* SoundGroup objects and internals */	objects and internals */
	#define FMOD_MEMBITS_STREAMBUFFER (1 << FMOD_MEMTYPE_STREAMB	#define FMOD_MEMBITS_STREAMBUFFER 0x00001000 /* Stream buff
	UFFER) /* Stream buffer memory */	er memory */
	#define FMOD_MEMBITS_DSPCONNECTION (1 << FMOD_MEMTYPE_DSPCONN	#define FMOD_MEMBITS_DSPCONNECTION 0x00002000 /* DSPConnecti
	ECTION) /* DSPConnection objects and internals */	on objects and internals */
	#define FMOD_MEMBITS_DSP (1 << FMOD_MEMTYPE_DSP)	#define FMOD_MEMBITS_DSP 0x00004000 /* DSP impleme
	/* DSP implementation objects */	ntation objects */
	#define FMOD_MEMBITS_DSPCODEC (1 << FMOD_MEMTYPE_DSPCODE	#define FMOD_MEMBITS_DSPCODEC 0x00008000 /* Realtime fi
	C) /* Realtime file format decoding DSP objects */	le format decoding DSP objects */
	#define FMOD_MEMBITS_PROFILE (1 << FMOD_MEMTYPE_PROFILE	#define FMOD_MEMBITS_PROFILE 0x00010000 /* Profiler me
	) /* Profiler memory footprint. */	mory footprint. */
	#define FMOD_MEMBITS_RECORDBUFFER (1 << FMOD_MEMTYPE_RECORDB	#define FMOD_MEMBITS_RECORDBUFFER 0x00020000 /* Buffer used
	UFFER) /* Buffer used to store recorded data from microphone */	to store recorded data from microphone */
	#define FMOD_MEMBITS_REVERB (1 << FMOD_MEMTYPE_REVERB)	#define FMOD_MEMBITS_REVERB 0x00040000 /* Reverb impl
	/* Reverb implementation objects */	ementation objects */
	#define FMOD_MEMBITS_REVERBCHANNELPROPS (1 << FMOD_MEMTYPE_REVERBC	#define FMOD_MEMBITS_REVERBCHANNELPROPS 0x00080000 /* Reverb chan
	HANNELPROPS) /* Reverb channel properties structs */	nel properties structs */
	#define FMOD_MEMBITS_GEOMETRY (1 << FMOD_MEMTYPE_GEOMETR	#define FMOD_MEMBITS_GEOMETRY 0x00100000 /* Geometry ob
	Y) /* Geometry objects and internals */	jects and internals */
	#define FMOD_MEMBITS_SYNCPOINT (1 << FMOD_MEMTYPE_SYNCPOI	#define FMOD_MEMBITS_SYNCPOINT 0x00200000 /* Sync point
	NT) /* Sync point memory. */	memory. */
	#define FMOD_MEMBITS_ALL 0xffffffff	#define FMOD_MEMBITS_ALL 0xffffffff /* All memory
	/* All memory used by FMOD Ex */	used by FMOD Ex */
	/* [DEFINE_END] */	/* [DEFINE_END] */

	/*	/*
	[DEFINE]	[DEFINE]
	[	[
	[NAME]	[NAME]
	FMOD_EVENT_MEMBITS	FMOD_EVENT_MEMBITS

	[DESCRIPTION]	[DESCRIPTION]
	Bitfield used to request specific memory usage information from the get MemoryInfo function of every public FMOD Event System class.	Bitfield used to request specific memory usage information from the get MemoryInfo function of every public FMOD Event System class.

	skipping to change at line 160	skipping to change at line 157
	The FMOD_EVENT_MEMBITS defines can be OR'd together to specify precisel y what memory usage you'd like to get information on. See EventSystem::getM emoryInfo for an example.	The FMOD_EVENT_MEMBITS defines can be OR'd together to specify precisel y what memory usage you'd like to get information on. See EventSystem::getM emoryInfo for an example.

	[PLATFORMS]	[PLATFORMS]
	Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation 2, PlaySt ation Portable, PlayStation 3, Wii, Solaris, iPhone	Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation 2, PlaySt ation Portable, PlayStation 3, Wii, Solaris, iPhone

	[SEE_ALSO]	[SEE_ALSO]
	FMOD_MEMBITS	FMOD_MEMBITS
	System::getMemoryInfo	System::getMemoryInfo
	]	]
	*/	*/

	#define FMOD_EVENT_MEMBITS_EVENTSYSTEM (1 << (FMOD_MEMTYPE_EVENTS	#define FMOD_EVENT_MEMBITS_EVENTSYSTEM 0x00000001 /* EventSystem
	YSTEM - FMOD_MEMTYPE_EVENTSYSTEM)) /* EventSystem and various in	and various internals */
	ternals */	#define FMOD_EVENT_MEMBITS_MUSICSYSTEM 0x00000002 /* MusicSystem
	#define FMOD_EVENT_MEMBITS_MUSICSYSTEM (1 << (FMOD_MEMTYPE_MUSICS	and various internals */
	YSTEM - FMOD_MEMTYPE_EVENTSYSTEM)) /* MusicSystem and various in	#define FMOD_EVENT_MEMBITS_FEV 0x00000004 /* Definition
	ternals */	of objects contained in all loaded projects e.g. events, groups, categories
	#define FMOD_EVENT_MEMBITS_FEV (1 << (FMOD_MEMTYPE_FEV	*/
	- FMOD_MEMTYPE_EVENTSYSTEM)) /* Definition of objects cont	#define FMOD_EVENT_MEMBITS_MEMORYFSB 0x00000008 /* Data loaded
	ained in all loaded projects e.g. events, groups, categories */	with registerMemoryFSB */
	#define FMOD_EVENT_MEMBITS_MEMORYFSB (1 << (FMOD_MEMTYPE_MEMORY	#define FMOD_EVENT_MEMBITS_EVENTPROJECT 0x00000010 /* EventProjec
	FSB - FMOD_MEMTYPE_EVENTSYSTEM)) /* Data loaded with registerM	t objects and internals */
	emoryFSB */	#define FMOD_EVENT_MEMBITS_EVENTGROUPI 0x00000020 /* EventGroup
	#define FMOD_EVENT_MEMBITS_EVENTPROJECT (1 << (FMOD_MEMTYPE_EVENTP	objects and internals */
	ROJECT - FMOD_MEMTYPE_EVENTSYSTEM)) /* EventProject objects and i	#define FMOD_EVENT_MEMBITS_SOUNDBANKCLASS 0x00000040 /* Objects use
	nternals */	d to manage wave banks */
	#define FMOD_EVENT_MEMBITS_EVENTGROUPI (1 << (FMOD_MEMTYPE_EVENTG	#define FMOD_EVENT_MEMBITS_SOUNDBANKLIST 0x00000080 /* Data used t
	ROUPI - FMOD_MEMTYPE_EVENTSYSTEM)) /* EventGroup objects and int	o manage lists of wave bank usage */
	ernals */	#define FMOD_EVENT_MEMBITS_STREAMINSTANCE 0x00000100 /* Stream obje
	#define FMOD_EVENT_MEMBITS_SOUNDBANKCLASS (1 << (FMOD_MEMTYPE_SOUNDB	cts and internals */
	ANKCLASS - FMOD_MEMTYPE_EVENTSYSTEM)) /* Objects used to manage wav	#define FMOD_EVENT_MEMBITS_SOUNDDEFCLASS 0x00000200 /* Sound defin
	e banks */	ition objects */
	#define FMOD_EVENT_MEMBITS_SOUNDBANKLIST (1 << (FMOD_MEMTYPE_SOUNDB	#define FMOD_EVENT_MEMBITS_SOUNDDEFDEFCLASS 0x00000400 /* Sound defin
	ANKLIST - FMOD_MEMTYPE_EVENTSYSTEM)) /* Data used to manage lists	ition static data objects */
	of wave bank usage */	#define FMOD_EVENT_MEMBITS_SOUNDDEFPOOL 0x00000800 /* Sound defin
	#define FMOD_EVENT_MEMBITS_STREAMINSTANCE (1 << (FMOD_MEMTYPE_STREAM	ition pool data */
	INSTANCE - FMOD_MEMTYPE_EVENTSYSTEM)) /* Stream objects and interna	#define FMOD_EVENT_MEMBITS_REVERBDEF 0x00001000 /* Reverb defi
	ls */	nition objects */
	#define FMOD_EVENT_MEMBITS_SOUNDDEFCLASS (1 << (FMOD_MEMTYPE_SOUNDD	#define FMOD_EVENT_MEMBITS_EVENTREVERB 0x00002000 /* Reverb obje
	EFCLASS - FMOD_MEMTYPE_EVENTSYSTEM)) /* Sound definition objects *	cts */
	/	#define FMOD_EVENT_MEMBITS_USERPROPERTY 0x00004000 /* User proper
	#define FMOD_EVENT_MEMBITS_SOUNDDEFDEFCLASS (1 << (FMOD_MEMTYPE_SOUNDD	ty objects */
	EFDEFCLASS - FMOD_MEMTYPE_EVENTSYSTEM)) /* Sound definition static da	#define FMOD_EVENT_MEMBITS_EVENTINSTANCE 0x00008000 /* Event insta
	ta objects */	nce base objects */
	#define FMOD_EVENT_MEMBITS_SOUNDDEFPOOL (1 << (FMOD_MEMTYPE_SOUNDD	#define FMOD_EVENT_MEMBITS_EVENTINSTANCE_COMPLEX 0x00010000 /* Complex eve
	EFPOOL - FMOD_MEMTYPE_EVENTSYSTEM)) /* Sound definition pool data	nt instance objects */
	*/	#define FMOD_EVENT_MEMBITS_EVENTINSTANCE_SIMPLE 0x00020000 /* Simple even
	#define FMOD_EVENT_MEMBITS_REVERBDEF (1 << (FMOD_MEMTYPE_REVERB	t instance objects */
	DEF - FMOD_MEMTYPE_EVENTSYSTEM)) /* Reverb definition objects	#define FMOD_EVENT_MEMBITS_EVENTINSTANCE_LAYER 0x00040000 /* Event layer
	*/	instance objects */
	#define FMOD_EVENT_MEMBITS_EVENTREVERB (1 << (FMOD_MEMTYPE_EVENTR	#define FMOD_EVENT_MEMBITS_EVENTINSTANCE_SOUND 0x00080000 /* Event sound
	EVERB - FMOD_MEMTYPE_EVENTSYSTEM)) /* Reverb objects */	instance objects */
	#define FMOD_EVENT_MEMBITS_USERPROPERTY (1 << (FMOD_MEMTYPE_USERPR	#define FMOD_EVENT_MEMBITS_EVENTENVELOPE 0x00100000 /* Event envel
	OPERTY - FMOD_MEMTYPE_EVENTSYSTEM)) /* User property objects */	ope objects */
	#define FMOD_EVENT_MEMBITS_EVENTINSTANCE (1 << (FMOD_MEMTYPE_EVENTI	#define FMOD_EVENT_MEMBITS_EVENTENVELOPEDEF 0x00200000 /* Event envel
	NSTANCE - FMOD_MEMTYPE_EVENTSYSTEM)) /* Event instance base object	ope definition objects */
	s */	#define FMOD_EVENT_MEMBITS_EVENTPARAMETER 0x00400000 /* Event param
	#define FMOD_EVENT_MEMBITS_EVENTINSTANCE_COMPLEX (1 << (FMOD_MEMTYPE_EVENTI	eter objects */
	NSTANCE_COMPLEX - FMOD_MEMTYPE_EVENTSYSTEM)) /* Complex event instance obj	#define FMOD_EVENT_MEMBITS_EVENTCATEGORY 0x00800000 /* Event categ
	ects */	ory objects */
	#define FMOD_EVENT_MEMBITS_EVENTINSTANCE_SIMPLE (1 << (FMOD_MEMTYPE_EVENTI	#define FMOD_EVENT_MEMBITS_EVENTENVELOPEPOINT 0x01000000 /* Event envel
	NSTANCE_SIMPLE - FMOD_MEMTYPE_EVENTSYSTEM)) /* Simple event instance obje	ope point object+s */
	cts */	#define FMOD_EVENT_MEMBITS_EVENTINSTANCEPOOL 0x02000000 /* Event insta
	#define FMOD_EVENT_MEMBITS_EVENTINSTANCE_LAYER (1 << (FMOD_MEMTYPE_EVENTI	nce pool data */
	NSTANCE_LAYER - FMOD_MEMTYPE_EVENTSYSTEM)) /* Event layer instance objec	#define FMOD_EVENT_MEMBITS_ALL 0xffffffff /* All memory
	ts */	used by FMOD Event System */
	#define FMOD_EVENT_MEMBITS_EVENTINSTANCE_SOUND (1 << (FMOD_MEMTYPE_EVENTI
	NSTANCE_SOUND - FMOD_MEMTYPE_EVENTSYSTEM)) /* Event sound instance objec
	ts */
	#define FMOD_EVENT_MEMBITS_EVENTENVELOPE (1 << (FMOD_MEMTYPE_EVENTE
	NVELOPE - FMOD_MEMTYPE_EVENTSYSTEM)) /* Event envelope objects */
	#define FMOD_EVENT_MEMBITS_EVENTENVELOPEDEF (1 << (FMOD_MEMTYPE_EVENTE
	NVELOPEDEF - FMOD_MEMTYPE_EVENTSYSTEM)) /* Event envelope definition
	objects */
	#define FMOD_EVENT_MEMBITS_EVENTPARAMETER (1 << (FMOD_MEMTYPE_EVENTP
	ARAMETER - FMOD_MEMTYPE_EVENTSYSTEM)) /* Event parameter objects */
	#define FMOD_EVENT_MEMBITS_EVENTCATEGORY (1 << (FMOD_MEMTYPE_EVENTC
	ATEGORY - FMOD_MEMTYPE_EVENTSYSTEM)) /* Event category objects */
	#define FMOD_EVENT_MEMBITS_EVENTENVELOPEPOINT (1 << (FMOD_MEMTYPE_EVENTE
	NVELOPEPOINT - FMOD_MEMTYPE_EVENTSYSTEM)) /* Event envelope point objec
	ts */
	#define FMOD_EVENT_MEMBITS_ALL 0xffffffff
	/* All memory used by FMOD Ev
	ent System */

	/* All event instance memory */	/* All event instance memory */
	#define FMOD_EVENT_MEMBITS_EVENTINSTANCE_GROUP (FMOD_EVENT_MEMBITS_EVENTI NSTANCE \| \	#define FMOD_EVENT_MEMBITS_EVENTINSTANCE_GROUP (FMOD_EVENT_MEMBITS_EVENTI NSTANCE \| \
	FMOD_EVENT_MEMBITS_EVE NTINSTANCE_COMPLEX \| \	FMOD_EVENT_MEMBITS_EVE NTINSTANCE_COMPLEX \| \
	FMOD_EVENT_MEMBITS_EVE NTINSTANCE_SIMPLE \| \	FMOD_EVENT_MEMBITS_EVE NTINSTANCE_SIMPLE \| \
	FMOD_EVENT_MEMBITS_EVE NTINSTANCE_LAYER \| \	FMOD_EVENT_MEMBITS_EVE NTINSTANCE_LAYER \| \
	FMOD_EVENT_MEMBITS_EVE NTINSTANCE_SOUND)	FMOD_EVENT_MEMBITS_EVE NTINSTANCE_SOUND)

	/* All sound definition memory */	/* All sound definition memory */
	#define FMOD_EVENT_MEMBITS_SOUNDDEF_GROUP (FMOD_EVENT_MEMBITS_SOUNDD EFCLASS \| \	#define FMOD_EVENT_MEMBITS_SOUNDDEF_GROUP (FMOD_EVENT_MEMBITS_SOUNDD EFCLASS \| \

End of changes. 9 change blocks.
	227 lines changed or deleted	207 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/

	fmod_dsp.h	fmod_dsp.h

	skipping to change at line 355	skipping to change at line 355
	FMOD_DSP_DELAY_CH6, /* Channel #6 Delay in ms. 0 to 10000. Defa ult = 0. */	FMOD_DSP_DELAY_CH6, /* Channel #6 Delay in ms. 0 to 10000. Defa ult = 0. */
	FMOD_DSP_DELAY_CH7, /* Channel #7 Delay in ms. 0 to 10000. Defa ult = 0. */	FMOD_DSP_DELAY_CH7, /* Channel #7 Delay in ms. 0 to 10000. Defa ult = 0. */
	FMOD_DSP_DELAY_CH8, /* Channel #8 Delay in ms. 0 to 10000. Defa ult = 0. */	FMOD_DSP_DELAY_CH8, /* Channel #8 Delay in ms. 0 to 10000. Defa ult = 0. */
	FMOD_DSP_DELAY_CH9, /* Channel #9 Delay in ms. 0 to 10000. Defa ult = 0. */	FMOD_DSP_DELAY_CH9, /* Channel #9 Delay in ms. 0 to 10000. Defa ult = 0. */
	FMOD_DSP_DELAY_CH10, /* Channel #10 Delay in ms. 0 to 10000. Def ault = 0. */	FMOD_DSP_DELAY_CH10, /* Channel #10 Delay in ms. 0 to 10000. Def ault = 0. */
	FMOD_DSP_DELAY_CH11, /* Channel #11 Delay in ms. 0 to 10000. Def ault = 0. */	FMOD_DSP_DELAY_CH11, /* Channel #11 Delay in ms. 0 to 10000. Def ault = 0. */
	FMOD_DSP_DELAY_CH12, /* Channel #12 Delay in ms. 0 to 10000. Def ault = 0. */	FMOD_DSP_DELAY_CH12, /* Channel #12 Delay in ms. 0 to 10000. Def ault = 0. */
	FMOD_DSP_DELAY_CH13, /* Channel #13 Delay in ms. 0 to 10000. Def ault = 0. */	FMOD_DSP_DELAY_CH13, /* Channel #13 Delay in ms. 0 to 10000. Def ault = 0. */
	FMOD_DSP_DELAY_CH14, /* Channel #14 Delay in ms. 0 to 10000. Def ault = 0. */	FMOD_DSP_DELAY_CH14, /* Channel #14 Delay in ms. 0 to 10000. Def ault = 0. */
	FMOD_DSP_DELAY_CH15, /* Channel #15 Delay in ms. 0 to 10000. Def ault = 0. */	FMOD_DSP_DELAY_CH15, /* Channel #15 Delay in ms. 0 to 10000. Def ault = 0. */

	FMOD_DSP_DELAY_MAXDELAY, /* Maximum delay in ms. 0 to 1000. Default = 10. */	FMOD_DSP_DELAY_MAXDELAY, /* Maximum delay in ms. 0 to 10000. Default = 10. */
	} FMOD_DSP_DELAY;	} FMOD_DSP_DELAY;

	/*	/*
	[ENUM]	[ENUM]
	[	[
	[DESCRIPTION]	[DESCRIPTION]
	Parameter types for the FMOD_DSP_TYPE_FLANGE filter.	Parameter types for the FMOD_DSP_TYPE_FLANGE filter.

	[REMARKS]	[REMARKS]
	Flange is an effect where the signal is played twice at the same time, and one copy slides back and forth creating a whooshing or flanging effect. <br>	Flange is an effect where the signal is played twice at the same time, and one copy slides back and forth creating a whooshing or flanging effect. <br>

	skipping to change at line 681	skipping to change at line 681
	/*	/*
	[ENUM]	[ENUM]
	[	[
	[DESCRIPTION]	[DESCRIPTION]
	Parameter types for the FMOD_DSP_TYPE_SFXREVERB unit.<br>	Parameter types for the FMOD_DSP_TYPE_SFXREVERB unit.<br>

	[REMARKS]	[REMARKS]
	This is a high quality I3DL2 based reverb which improves greatly on FMO D_DSP_REVERB.<br>	This is a high quality I3DL2 based reverb which improves greatly on FMO D_DSP_REVERB.<br>
	On top of the I3DL2 property set, "Dry Level" is also included to allow the dry mix to be changed.<br>	On top of the I3DL2 property set, "Dry Level" is also included to allow the dry mix to be changed.<br>
	<br>	<br>

	Currently FMOD_DSP_SFXREVERB_REFLECTIONSLEVEL, FMOD_DSP_SFXREVERB_REFLE
	CTIONSDELAY and FMOD_DSP_SFXREVERB_REVERBDELAY are not enabled but will com
	e in future versions.<br>
	<br>
	These properties can be set with presets in FMOD_REVERB_PRESETS.	These properties can be set with presets in FMOD_REVERB_PRESETS.

	[PLATFORMS]	[PLATFORMS]
	Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation 2, PlaySt ation Portable, PlayStation 3, Wii, Solaris, iPhone	Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation 2, PlaySt ation Portable, PlayStation 3, Wii, Solaris, iPhone

	[SEE_ALSO]	[SEE_ALSO]
	DSP::SetParameter	DSP::SetParameter
	DSP::GetParameter	DSP::GetParameter
	FMOD_DSP_TYPE	FMOD_DSP_TYPE
	System::addDSP	System::addDSP
	FMOD_REVERB_PRESETS	FMOD_REVERB_PRESETS
	]	]
	*/	*/
	typedef enum	typedef enum
	{	{
	FMOD_DSP_SFXREVERB_DRYLEVEL, /* Dry Level : Mix level o f dry signal in output in mB. Ranges from -10000.0 to 0.0. Default is 0. */	FMOD_DSP_SFXREVERB_DRYLEVEL, /* Dry Level : Mix level o f dry signal in output in mB. Ranges from -10000.0 to 0.0. Default is 0. */

	FMOD_DSP_SFXREVERB_ROOM, /* Room : Room effect level at low frequencies in mB. Ranges from -10000.0 to 0.0. Default is 0.0. */	FMOD_DSP_SFXREVERB_ROOM, /* Room : Room effect level at low frequencies in mB. Ranges from -10000.0 to 0.0. Default is -10000.0. */
	FMOD_DSP_SFXREVERB_ROOMHF, /* Room HF : Room effect high-frequency level re. low frequency level in mB. Ranges from -10000.0 to 0.0. Default is 0.0. */	FMOD_DSP_SFXREVERB_ROOMHF, /* Room HF : Room effect high-frequency level re. low frequency level in mB. Ranges from -10000.0 to 0.0. Default is 0.0. */
	FMOD_DSP_SFXREVERB_ROOMROLLOFFFACTOR, /* Room Rolloff : Like DS3D f lRolloffFactor but for room effect. Ranges from 0.0 to 10.0. Default is 10 .0 */	FMOD_DSP_SFXREVERB_ROOMROLLOFFFACTOR, /* Room Rolloff : Like DS3D f lRolloffFactor but for room effect. Ranges from 0.0 to 10.0. Default is 10 .0 */
	FMOD_DSP_SFXREVERB_DECAYTIME, /* Decay Time : Reverberati on decay time at low-frequencies in seconds. Ranges from 0.1 to 20.0. Defa ult is 1.0. */	FMOD_DSP_SFXREVERB_DECAYTIME, /* Decay Time : Reverberati on decay time at low-frequencies in seconds. Ranges from 0.1 to 20.0. Defa ult is 1.0. */
	FMOD_DSP_SFXREVERB_DECAYHFRATIO, /* Decay HF Ratio : High-freque ncy to low-frequency decay time ratio. Ranges from 0.1 to 2.0. Default is 0.5. */	FMOD_DSP_SFXREVERB_DECAYHFRATIO, /* Decay HF Ratio : High-freque ncy to low-frequency decay time ratio. Ranges from 0.1 to 2.0. Default is 0.5. */
	FMOD_DSP_SFXREVERB_REFLECTIONSLEVEL, /* Reflections : Early refle ctions level relative to room effect in mB. Ranges from -10000.0 to 1000.0 . Default is -10000.0. */	FMOD_DSP_SFXREVERB_REFLECTIONSLEVEL, /* Reflections : Early refle ctions level relative to room effect in mB. Ranges from -10000.0 to 1000.0 . Default is -10000.0. */
	FMOD_DSP_SFXREVERB_REFLECTIONSDELAY, /* Reflect Delay : Delay time of first reflection in seconds. Ranges from 0.0 to 0.3. Default is 0.02. */	FMOD_DSP_SFXREVERB_REFLECTIONSDELAY, /* Reflect Delay : Delay time of first reflection in seconds. Ranges from 0.0 to 0.3. Default is 0.02. */
	FMOD_DSP_SFXREVERB_REVERBLEVEL, /* Reverb : Late reverb eration level relative to room effect in mB. Ranges from -10000.0 to 2000. 0. Default is 0.0. */	FMOD_DSP_SFXREVERB_REVERBLEVEL, /* Reverb : Late reverb eration level relative to room effect in mB. Ranges from -10000.0 to 2000. 0. Default is 0.0. */
	FMOD_DSP_SFXREVERB_REVERBDELAY, /* Reverb Delay : Late reverb eration delay time relative to first reflection in seconds. Ranges from 0. 0 to 0.1. Default is 0.04. */	FMOD_DSP_SFXREVERB_REVERBDELAY, /* Reverb Delay : Late reverb eration delay time relative to first reflection in seconds. Ranges from 0. 0 to 0.1. Default is 0.04. */
	FMOD_DSP_SFXREVERB_DIFFUSION, /* Diffusion : Reverberati on diffusion (echo density) in percent. Ranges from 0.0 to 100.0. Default is 100.0. */	FMOD_DSP_SFXREVERB_DIFFUSION, /* Diffusion : Reverberati on diffusion (echo density) in percent. Ranges from 0.0 to 100.0. Default is 100.0. */
	FMOD_DSP_SFXREVERB_DENSITY, /* Density : Reverberati on density (modal density) in percent. Ranges from 0.0 to 100.0. Default is 100.0. */	FMOD_DSP_SFXREVERB_DENSITY, /* Density : Reverberati on density (modal density) in percent. Ranges from 0.0 to 100.0. Default is 100.0. */

End of changes. 3 change blocks.
	6 lines changed or deleted	2 lines changed or added

	fmod_errors.h	fmod_errors.h

	skipping to change at line 82	skipping to change at line 82
	case FMOD_ERR_INVALID_POSITION: return "An invalid seek posit ion was passed to this function. ";	case FMOD_ERR_INVALID_POSITION: return "An invalid seek posit ion was passed to this function. ";
	case FMOD_ERR_INVALID_SPEAKER: return "An invalid speaker wa s passed to this function based on the current speaker mode. ";	case FMOD_ERR_INVALID_SPEAKER: return "An invalid speaker wa s passed to this function based on the current speaker mode. ";
	case FMOD_ERR_INVALID_SYNCPOINT: return "The syncpoint did not come from this sound handle. ";	case FMOD_ERR_INVALID_SYNCPOINT: return "The syncpoint did not come from this sound handle. ";
	case FMOD_ERR_INVALID_VECTOR: return "The vectors passed in are not unit length, or perpendicular. ";	case FMOD_ERR_INVALID_VECTOR: return "The vectors passed in are not unit length, or perpendicular. ";
	case FMOD_ERR_IRX: return "PS2 only. fmodex.irx failed to initialize. This is most likely because you forgot to load it. ";	case FMOD_ERR_IRX: return "PS2 only. fmodex.irx failed to initialize. This is most likely because you forgot to load it. ";
	case FMOD_ERR_MAXAUDIBLE: return "Reached maximum audib le playback count for this sound's soundgroup. ";	case FMOD_ERR_MAXAUDIBLE: return "Reached maximum audib le playback count for this sound's soundgroup. ";
	case FMOD_ERR_MEMORY: return "Not enough memory or resources. ";	case FMOD_ERR_MEMORY: return "Not enough memory or resources. ";
	case FMOD_ERR_MEMORY_CANTPOINT: return "Can't use FMOD_OPENME MORY_POINT on non PCM source data, or non mp3/xma/adpcm data if FMOD_CREATE COMPRESSEDSAMPLE was used. ";	case FMOD_ERR_MEMORY_CANTPOINT: return "Can't use FMOD_OPENME MORY_POINT on non PCM source data, or non mp3/xma/adpcm data if FMOD_CREATE COMPRESSEDSAMPLE was used. ";
	case FMOD_ERR_MEMORY_IOP: return "PS2 only. Not enough memory or resources on PlayStation 2 IOP ram. ";	case FMOD_ERR_MEMORY_IOP: return "PS2 only. Not enough memory or resources on PlayStation 2 IOP ram. ";
	case FMOD_ERR_MEMORY_SRAM: return "Not enough memory or resources on console sound ram. ";	case FMOD_ERR_MEMORY_SRAM: return "Not enough memory or resources on console sound ram. ";

		case FMOD_ERR_MUSIC_NOCALLBACK: return "The music callback is
		required, but it has not been set. ";
		case FMOD_ERR_MUSIC_NOTFOUND: return "The requested music e
		ntity could not be found. ";
	case FMOD_ERR_MUSIC_UNINITIALIZED: return "Music system is not i nitialized probably because no music data is loaded. ";	case FMOD_ERR_MUSIC_UNINITIALIZED: return "Music system is not i nitialized probably because no music data is loaded. ";
	case FMOD_ERR_NEEDS2D: return "Tried to call a comma nd on a 3d sound when the command was meant for 2d sound. ";	case FMOD_ERR_NEEDS2D: return "Tried to call a comma nd on a 3d sound when the command was meant for 2d sound. ";
	case FMOD_ERR_NEEDS3D: return "Tried to call a comma nd on a 2d sound when the command was meant for 3d sound. ";	case FMOD_ERR_NEEDS3D: return "Tried to call a comma nd on a 2d sound when the command was meant for 3d sound. ";
	case FMOD_ERR_NEEDSHARDWARE: return "Tried to use a featur e that requires hardware support. (ie trying to play a VAG compressed soun d in software on PS2). ";	case FMOD_ERR_NEEDSHARDWARE: return "Tried to use a featur e that requires hardware support. (ie trying to play a VAG compressed soun d in software on PS2). ";
	case FMOD_ERR_NEEDSSOFTWARE: return "Tried to use a featur e that requires the software engine. Software engine has either been turne d off, or command was executed on a hardware channel which does not support this feature. ";	case FMOD_ERR_NEEDSSOFTWARE: return "Tried to use a featur e that requires the software engine. Software engine has either been turne d off, or command was executed on a hardware channel which does not support this feature. ";
	case FMOD_ERR_NET_CONNECT: return "Couldn't connect to t he specified host. ";	case FMOD_ERR_NET_CONNECT: return "Couldn't connect to t he specified host. ";
	case FMOD_ERR_NET_SOCKET_ERROR: return "A socket error occurr ed. This is a catch-all for socket-related errors not listed elsewhere. ";	case FMOD_ERR_NET_SOCKET_ERROR: return "A socket error occurr ed. This is a catch-all for socket-related errors not listed elsewhere. ";
	case FMOD_ERR_NET_URL: return "The specified URL cou ldn't be resolved. ";	case FMOD_ERR_NET_URL: return "The specified URL cou ldn't be resolved. ";
	case FMOD_ERR_NET_WOULD_BLOCK: return "Operation on a non-bl ocking socket could not complete immediately. ";	case FMOD_ERR_NET_WOULD_BLOCK: return "Operation on a non-bl ocking socket could not complete immediately. ";

	case FMOD_ERR_NOTREADY: return "Operation could not b e performed because specified sound is not ready. ";	case FMOD_ERR_NOTREADY: return "Operation could not b e performed because specified sound/DSP connection is not ready. ";
	case FMOD_ERR_OUTPUT_ALLOCATED: return "Error initializing ou tput device, but more specifically, the output device is already in use and cannot be reused. ";	case FMOD_ERR_OUTPUT_ALLOCATED: return "Error initializing ou tput device, but more specifically, the output device is already in use and cannot be reused. ";
	case FMOD_ERR_OUTPUT_CREATEBUFFER: return "Error creating hardwa re sound buffer. ";	case FMOD_ERR_OUTPUT_CREATEBUFFER: return "Error creating hardwa re sound buffer. ";
	case FMOD_ERR_OUTPUT_DRIVERCALL: return "A call to a standard soundcard driver failed, which could possibly mean a bug in the driver or r esources were missing or exhausted. ";	case FMOD_ERR_OUTPUT_DRIVERCALL: return "A call to a standard soundcard driver failed, which could possibly mean a bug in the driver or r esources were missing or exhausted. ";
	case FMOD_ERR_OUTPUT_ENUMERATION: return "Error enumerating the available driver list. List may be inconsistent due to a recent device add ition or removal. ";	case FMOD_ERR_OUTPUT_ENUMERATION: return "Error enumerating the available driver list. List may be inconsistent due to a recent device add ition or removal. ";
	case FMOD_ERR_OUTPUT_FORMAT: return "Soundcard does not su pport the minimum features needed for this soundsystem (16bit stereo output ). ";	case FMOD_ERR_OUTPUT_FORMAT: return "Soundcard does not su pport the minimum features needed for this soundsystem (16bit stereo output ). ";
	case FMOD_ERR_OUTPUT_INIT: return "Error initializing ou tput device. ";	case FMOD_ERR_OUTPUT_INIT: return "Error initializing ou tput device. ";
	case FMOD_ERR_OUTPUT_NOHARDWARE: return "FMOD_HARDWARE was spe cified but the sound card does not have the resources necessary to play it. ";	case FMOD_ERR_OUTPUT_NOHARDWARE: return "FMOD_HARDWARE was spe cified but the sound card does not have the resources necessary to play it. ";
	case FMOD_ERR_OUTPUT_NOSOFTWARE: return "Attempted to create a software sound but no software channels were specified in System::init. ";	case FMOD_ERR_OUTPUT_NOSOFTWARE: return "Attempted to create a software sound but no software channels were specified in System::init. ";
	case FMOD_ERR_PAN: return "Panning only works wi th mono or stereo sound sources. ";	case FMOD_ERR_PAN: return "Panning only works wi th mono or stereo sound sources. ";
	case FMOD_ERR_PLUGIN: return "An unspecified error has been returned from a 3rd party plugin. ";	case FMOD_ERR_PLUGIN: return "An unspecified error has been returned from a 3rd party plugin. ";

End of changes. 2 change blocks.
	1 lines changed or deleted	5 lines changed or added

	fmod_event.h		fmod_event.h

	skipping to change at line 24		skipping to change at line 24

	#ifndef _FMOD_H		#ifndef _FMOD_H
	#include "fmod.h"		#include "fmod.h"
	#endif		#endif

	/*		/*
	FMOD EventSystem version number. Check this against FMOD::EventSystem: :getVersion.		FMOD EventSystem version number. Check this against FMOD::EventSystem: :getVersion.
	0xaaaabbcc -> aaaa = major version number. bb = minor version number. cc = development version number.		0xaaaabbcc -> aaaa = major version number. bb = minor version number. cc = development version number.
	*/		*/


	#define FMOD_EVENT_VERSION 0x00042806		#define FMOD_EVENT_VERSION 0x00043005

	/*		/*
	FMOD event types		FMOD event types
	*/		*/

	typedef struct FMOD_EVENTSYSTEM FMOD_EVENTSYSTEM;		typedef struct FMOD_EVENTSYSTEM FMOD_EVENTSYSTEM;
	typedef struct FMOD_EVENTPROJECT FMOD_EVENTPROJECT;		typedef struct FMOD_EVENTPROJECT FMOD_EVENTPROJECT;
	typedef struct FMOD_EVENTGROUP FMOD_EVENTGROUP;		typedef struct FMOD_EVENTGROUP FMOD_EVENTGROUP;
	typedef struct FMOD_EVENTCATEGORY FMOD_EVENTCATEGORY;		typedef struct FMOD_EVENTCATEGORY FMOD_EVENTCATEGORY;
	typedef struct FMOD_EVENT FMOD_EVENT;		typedef struct FMOD_EVENT FMOD_EVENT;

	skipping to change at line 72		skipping to change at line 72
	EventSystem::getEventByGUID		EventSystem::getEventByGUID
	FMOD_EVENT_SOUNDDEFINFO		FMOD_EVENT_SOUNDDEFINFO
	FMOD_EVENT_CALLBACKTYPE		FMOD_EVENT_CALLBACKTYPE
	]		]
	*/		*/
	#define FMOD_EVENT_INIT_NORMAL 0x00000000 /* All platforms - Initialize normally */		#define FMOD_EVENT_INIT_NORMAL 0x00000000 /* All platforms - Initialize normally */
	#define FMOD_EVENT_INIT_USER_ASSETMANAGER 0x00000001 /* All platforms - All wave data loading/freeing will be referred back to the user through the event callback */		#define FMOD_EVENT_INIT_USER_ASSETMANAGER 0x00000001 /* All platforms - All wave data loading/freeing will be referred back to the user through the event callback */
	#define FMOD_EVENT_INIT_FAIL_ON_MAXSTREAMS 0x00000002 /* All platforms - Events will fail if "Max streams" was reached when playing streamed bank s, instead of going virtual. */		#define FMOD_EVENT_INIT_FAIL_ON_MAXSTREAMS 0x00000002 /* All platforms - Events will fail if "Max streams" was reached when playing streamed bank s, instead of going virtual. */
	#define FMOD_EVENT_INIT_DONTUSENAMES 0x00000004 /* All platforms - All event/eventgroup/eventparameter/eventcategory/eventreverb names will be discarded on load. Use getXXXByIndex to access them. This may potential ly save a lot of memory at runtime. */		#define FMOD_EVENT_INIT_DONTUSENAMES 0x00000004 /* All platforms - All event/eventgroup/eventparameter/eventcategory/eventreverb names will be discarded on load. Use getXXXByIndex to access them. This may potential ly save a lot of memory at runtime. */
	#define FMOD_EVENT_INIT_UPPERCASE_FILENAMES 0x00000008 /* All platforms - All FSB filenames will be translated to upper case before being used. */		#define FMOD_EVENT_INIT_UPPERCASE_FILENAMES 0x00000008 /* All platforms - All FSB filenames will be translated to upper case before being used. */

			#define FMOD_EVENT_INIT_LOWERCASE_FILENAMES 0x00000080 /* All platforms - All FSB filenames will be translated to lower case before being used. */
	#define FMOD_EVENT_INIT_SEARCH_PLUGINS 0x00000010 /* All platforms - Search the current directory for dsp/codec plugins on EventSystem::init. */		#define FMOD_EVENT_INIT_SEARCH_PLUGINS 0x00000010 /* All platforms - Search the current directory for dsp/codec plugins on EventSystem::init. */
	#define FMOD_EVENT_INIT_USE_GUIDS 0x00000020 /* All platforms - Build an event GUID table when loading FEVs so that EventSystem::getEven tByGUID can be used. */		#define FMOD_EVENT_INIT_USE_GUIDS 0x00000020 /* All platforms - Build an event GUID table when loading FEVs so that EventSystem::getEven tByGUID can be used. */