FMOD Ex: headers diff between 44416 and 44417 versions

	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 0x00044416	#define FMOD_EVENT_VERSION 0x00044417

	/*	/*
	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;

End of changes. 1 change blocks.
	1 lines changed or deleted	1 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 0x00044416	#define FMOD_EVENT_NET_VERSION 0x00044417

	/*	/*
	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

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

	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 0x00044416	#define FMOD_VERSION 0x00044417

	/*	/*
	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 1476	skipping to change at line 1476
	int numchannels; /* [w] Optional. Spe cify 0 to ignore. Number of channels in a sound mandatory if FMOD_OPENUSER or FMOD_OPENRAW is used. */	int numchannels; /* [w] Optional. Spe cify 0 to ignore. Number of channels in a sound mandatory if FMOD_OPENUSER or FMOD_OPENRAW is used. */
	int defaultfrequency; /* [w] Optional. Spe cify 0 to ignore. Default frequency of sound in a sound mandatory if FMOD_O PENUSER or FMOD_OPENRAW is used. Other formats use the frequency determine d by the file format. */	int defaultfrequency; /* [w] Optional. Spe cify 0 to ignore. Default frequency of sound in a sound mandatory if FMOD_O PENUSER or FMOD_OPENRAW is used. Other formats use the frequency determine d by the file format. */
	FMOD_SOUND_FORMAT format; /* [w] Optional. Spe cify 0 or FMOD_SOUND_FORMAT_NONE to ignore. Format of the sound mandatory i f FMOD_OPENUSER or FMOD_OPENRAW is used. Other formats use the format dete rmined by the file format. */	FMOD_SOUND_FORMAT format; /* [w] Optional. Spe cify 0 or FMOD_SOUND_FORMAT_NONE to ignore. Format of the sound mandatory i f FMOD_OPENUSER or FMOD_OPENRAW is used. Other formats use the format dete rmined by the file format. */
	unsigned int decodebuffersize; /* [w] Optional. Spe cify 0 to ignore. For streams. This determines the size of the double buff er (in PCM samples) that a stream uses. Use this for user created streams if you want to determine the size of the callback buffer passed to you. Sp ecify 0 to use FMOD's default size which is currently equivalent to 400ms o f the sound format created/loaded. */	unsigned int decodebuffersize; /* [w] Optional. Spe cify 0 to ignore. For streams. This determines the size of the double buff er (in PCM samples) that a stream uses. Use this for user created streams if you want to determine the size of the callback buffer passed to you. Sp ecify 0 to use FMOD's default size which is currently equivalent to 400ms o f the sound format created/loaded. */
	int initialsubsound; /* [w] Optional. Spe cify 0 to ignore. In a multi-sample file format such as .FSB/.DLS/.SF2, spe cify the initial subsound to seek to, only if FMOD_CREATESTREAM is used. */	int initialsubsound; /* [w] Optional. Spe cify 0 to ignore. In a multi-sample file format such as .FSB/.DLS/.SF2, spe cify the initial subsound to seek to, only if FMOD_CREATESTREAM is used. */
	int numsubsounds; /* [w] Optional. Spe cify 0 to ignore or have no subsounds. In a sound created with FMOD_OPENUS ER, specify the number of subsounds that are accessable with Sound::getSubS ound. If not created with FMOD_OPENUSER, this will limit the number of sub sounds loaded within a multi-subsound file. If using FSB, then if FMOD_CRE ATESOUNDEXINFO::inclusionlist is used, this will shuffle subsounds down so that there are not any gaps. It will mean that the indices of the sounds w ill be different. */	int numsubsounds; /* [w] Optional. Spe cify 0 to ignore or have no subsounds. In a sound created with FMOD_OPENUS ER, specify the number of subsounds that are accessable with Sound::getSubS ound. If not created with FMOD_OPENUSER, this will limit the number of sub sounds loaded within a multi-subsound file. If using FSB, then if FMOD_CRE ATESOUNDEXINFO::inclusionlist is used, this will shuffle subsounds down so that there are not any gaps. It will mean that the indices of the sounds w ill be different. */
	int inclusionlist; / [w] Optional. Spe cify 0 to ignore. In a multi-sample format such as .FSB/.DLS/.SF2 it may be desirable to specify only a subset of sounds to be loaded out of the whole file. This is an array of subsound indices to load into memory when creat ed. */	int inclusionlist; / [w] Optional. Spe cify 0 to ignore. In a multi-sample format such as .FSB/.DLS/.SF2 it may be desirable to specify only a subset of sounds to be loaded out of the whole file. This is an array of subsound indices to load into memory when creat ed. */
	int inclusionlistnum; /* [w] Optional. Spe cify 0 to ignore. This is the number of integers contained within the inclu sionlist array. */	int inclusionlistnum; /* [w] Optional. Spe cify 0 to ignore. This is the number of integers contained within the inclu sionlist array. */
	FMOD_SOUND_PCMREADCALLBACK pcmreadcallback; /* [w] Optional. Spe cify 0 to ignore. Callback to 'piggyback' on FMOD's read functions and acce pt or even write PCM data while FMOD is opening the sound. Used for user s ounds created with FMOD_OPENUSER or for capturing decoded data as FMOD read s it. */	FMOD_SOUND_PCMREADCALLBACK pcmreadcallback; /* [w] Optional. Spe cify 0 to ignore. Callback to 'piggyback' on FMOD's read functions and acce pt or even write PCM data while FMOD is opening the sound. Used for user s ounds created with FMOD_OPENUSER or for capturing decoded data as FMOD read s it. */
	FMOD_SOUND_PCMSETPOSCALLBACK pcmsetposcallback; /* [w] Optional. Spe cify 0 to ignore. Callback for when the user calls a seeking function such as Channel::setTime or Channel::setPosition within a multi-sample sound, an d for when it is opened.*/	FMOD_SOUND_PCMSETPOSCALLBACK pcmsetposcallback; /* [w] Optional. Spe cify 0 to ignore. Callback for when the user calls a seeking function such as Channel::setTime or Channel::setPosition within a multi-sample sound, an d for when it is opened.*/

	FMOD_SOUND_NONBLOCKCALLBACK nonblockcallback; /* [w] Optional. Spe cify 0 to ignore. Callback for successful completion, or error while loadin g a sound that used the FMOD_NONBLOCKING flag.*/	FMOD_SOUND_NONBLOCKCALLBACK nonblockcallback; /* [w] Optional. Spe cify 0 to ignore. Callback for successful completion, or error while loadin g a sound that used the FMOD_NONBLOCKING flag. Also called duing seeking, when setPosition is called or a stream is restarted. */
	const char dlsname; / [w] Optional. Spe cify 0 to ignore. Filename for a DLS or SF2 sample set when loading a MIDI file. If not specified, on Windows it will attempt to open /windows/system3 2/drivers/gm.dls or /windows/system32/drivers/etc/gm.dls, on Mac it will at tempt to load /System/Library/Components/CoreAudio.component/Contents/Resou rces/gs_instruments.dls, otherwise the MIDI will fail to open. Current DLS support is for level 1 of the specification. */	const char dlsname; / [w] Optional. Spe cify 0 to ignore. Filename for a DLS or SF2 sample set when loading a MIDI file. If not specified, on Windows it will attempt to open /windows/system3 2/drivers/gm.dls or /windows/system32/drivers/etc/gm.dls, on Mac it will at tempt to load /System/Library/Components/CoreAudio.component/Contents/Resou rces/gs_instruments.dls, otherwise the MIDI will fail to open. Current DLS support is for level 1 of the specification. */
	const char encryptionkey; / [w] Optional. Spe cify 0 to ignore. Key for encrypted FSB file. Without this key an encrypte d FSB file will not load. */	const char encryptionkey; / [w] Optional. Spe cify 0 to ignore. Key for encrypted FSB file. Without this key an encrypte d FSB file will not load. */
	int maxpolyphony; /* [w] Optional. Spe cify 0 to ignore. For sequenced formats with dynamic channel allocation suc h as .MID and .IT, this specifies the maximum voice count allowed while pla ying. .IT defaults to 64. .MID defaults to 32. */	int maxpolyphony; /* [w] Optional. Spe cify 0 to ignore. For sequenced formats with dynamic channel allocation suc h as .MID and .IT, this specifies the maximum voice count allowed while pla ying. .IT defaults to 64. .MID defaults to 32. */
	void userdata; / [w] Optional. Spe cify 0 to ignore. This is user data to be attached to the sound during crea tion. Access via Sound::getUserData. Note: This is not passed to FMOD_FIL E_OPENCALLBACK, that is a different userdata that is file specific. */	void userdata; / [w] Optional. Spe cify 0 to ignore. This is user data to be attached to the sound during crea tion. Access via Sound::getUserData. Note: This is not passed to FMOD_FIL E_OPENCALLBACK, that is a different userdata that is file specific. */
	FMOD_SOUND_TYPE suggestedsoundtype; /* [w] Optional. Spe cify 0 or FMOD_SOUND_TYPE_UNKNOWN to ignore. Instead of scanning all codec types, use this to speed up loading by making it jump straight to this cod ec. */	FMOD_SOUND_TYPE suggestedsoundtype; /* [w] Optional. Spe cify 0 or FMOD_SOUND_TYPE_UNKNOWN to ignore. Instead of scanning all codec types, use this to speed up loading by making it jump straight to this cod ec. */
	FMOD_FILE_OPENCALLBACK useropen; /* [w] Optional. Spe cify 0 to ignore. Callback for opening this file. */	FMOD_FILE_OPENCALLBACK useropen; /* [w] Optional. Spe cify 0 to ignore. Callback for opening this file. */
	FMOD_FILE_CLOSECALLBACK userclose; /* [w] Optional. Spe cify 0 to ignore. Callback for closing this file. */	FMOD_FILE_CLOSECALLBACK userclose; /* [w] Optional. Spe cify 0 to ignore. Callback for closing this file. */
	FMOD_FILE_READCALLBACK userread; /* [w] Optional. Spe cify 0 to ignore. Callback for reading from this file. */	FMOD_FILE_READCALLBACK userread; /* [w] Optional. Spe cify 0 to ignore. Callback for reading from this file. */
	FMOD_FILE_SEEKCALLBACK userseek; /* [w] Optional. Spe cify 0 to ignore. Callback for seeking within this file. */	FMOD_FILE_SEEKCALLBACK userseek; /* [w] Optional. Spe cify 0 to ignore. Callback for seeking within this file. */
	FMOD_FILE_ASYNCREADCALLBACK userasyncread; /* [w] Optional. Spe cify 0 to ignore. Callback for seeking within this file. */	FMOD_FILE_ASYNCREADCALLBACK userasyncread; /* [w] Optional. Spe cify 0 to ignore. Callback for seeking within this file. */

	skipping to change at line 1765	skipping to change at line 1765
	]	]
	*/	*/
	typedef struct FMOD_ADVANCEDSETTINGS	typedef struct FMOD_ADVANCEDSETTINGS
	{	{
	int cbsize; /* [w] Size of this struc ture. Use sizeof(FMOD_ADVANCEDSETTINGS) NOTE: This must be set before cal ling System::getAdvancedSettings! */	int cbsize; /* [w] Size of this struc ture. Use sizeof(FMOD_ADVANCEDSETTINGS) NOTE: This must be set before cal ling System::getAdvancedSettings! */
	int maxMPEGcodecs; /* [r/w] Optional. Specify 0 to ignore. For use with FMOD_CREATECOMPRESSEDSAMPLE only. Mpeg codecs c onsume 21,684 bytes per instance and this number will determine how many mp eg channels can be played simultaneously. Default = 32. */	int maxMPEGcodecs; /* [r/w] Optional. Specify 0 to ignore. For use with FMOD_CREATECOMPRESSEDSAMPLE only. Mpeg codecs c onsume 21,684 bytes per instance and this number will determine how many mp eg channels can be played simultaneously. Default = 32. */
	int maxADPCMcodecs; /* [r/w] Optional. Specify 0 to ignore. For use with FMOD_CREATECOMPRESSEDSAMPLE only. ADPCM codecs c onsume 2,136 bytes per instance and this number will determine how many AD PCM channels can be played simultaneously. Default = 32. */	int maxADPCMcodecs; /* [r/w] Optional. Specify 0 to ignore. For use with FMOD_CREATECOMPRESSEDSAMPLE only. ADPCM codecs c onsume 2,136 bytes per instance and this number will determine how many AD PCM channels can be played simultaneously. Default = 32. */
	int maxXMAcodecs; /* [r/w] Optional. Specify 0 to ignore. For use with FMOD_CREATECOMPRESSEDSAMPLE only. XMA codecs c onsume 14,836 bytes per instance and this number will determine how many XM A channels can be played simultaneously. Default = 32. */	int maxXMAcodecs; /* [r/w] Optional. Specify 0 to ignore. For use with FMOD_CREATECOMPRESSEDSAMPLE only. XMA codecs c onsume 14,836 bytes per instance and this number will determine how many XM A channels can be played simultaneously. Default = 32. */
	int maxCELTcodecs; /* [r/w] Optional. Specify 0 to ignore. For use with FMOD_CREATECOMPRESSEDSAMPLE only. CELT codecs c onsume 11,500 bytes per instance and this number will determine how many CE LT channels can be played simultaneously. Default = 32. */	int maxCELTcodecs; /* [r/w] Optional. Specify 0 to ignore. For use with FMOD_CREATECOMPRESSEDSAMPLE only. CELT codecs c onsume 11,500 bytes per instance and this number will determine how many CE LT channels can be played simultaneously. Default = 32. */
	int maxVORBIScodecs; /* [r/w] Optional. Specify 0 to ignore. For use with FMOD_CREATECOMPRESSEDSAMPLE only. Vorbis codecs consume 12,000 bytes per instance and this number will determine how many V orbis channels can be played simultaneously. Default = 32. */	int maxVORBIScodecs; /* [r/w] Optional. Specify 0 to ignore. For use with FMOD_CREATECOMPRESSEDSAMPLE only. Vorbis codecs consume 12,000 bytes per instance and this number will determine how many V orbis channels can be played simultaneously. Default = 32. */

		int maxAT9Codecs; /* [r/w] Optional. Specify 0 to ignore. For use with FMOD_CREATECOMPRESSEDSAMPLE only. AT9 codecs con sume 8,720 bytes per instance and this number will determine how many AT9 channels can be played simultaneously. Default = 32. */
	int maxPCMcodecs; /* [r/w] Optional. Specify 0 to ignore. For use with PS3 only. PCM codecs c onsume 12,672 bytes per instance and this number will determine how many st reams and PCM voices can be played simultaneously. Default = 16. */	int maxPCMcodecs; /* [r/w] Optional. Specify 0 to ignore. For use with PS3 only. PCM codecs c onsume 12,672 bytes per instance and this number will determine how many st reams and PCM voices can be played simultaneously. Default = 16. */
	int ASIONumChannels; /* [r/w] Optional. Specify 0 to ignore. Number of channels available on the ASIO device. */	int ASIONumChannels; /* [r/w] Optional. Specify 0 to ignore. Number of channels available on the ASIO device. */
	char *ASIOChannelList; / [r/w] Optional. Specify 0 to ignore. Pointer to an array of strings (number of entries defined by A SIONumChannels) with ASIO channel names. */	char *ASIOChannelList; / [r/w] Optional. Specify 0 to ignore. Pointer to an array of strings (number of entries defined by A SIONumChannels) with ASIO channel names. */
	FMOD_SPEAKER ASIOSpeakerList; / [r/w] Optional. Specify 0 to ignore. Pointer to a list of speakers that the ASIO channels map to. This can be called after System::init to remap ASIO output. */	FMOD_SPEAKER ASIOSpeakerList; / [r/w] Optional. Specify 0 to ignore. Pointer to a list of speakers that the ASIO channels map to. This can be called after System::init to remap ASIO output. */
	int max3DReverbDSPs; /* [r/w] Optional. Specify 0 to ignore. The max number of 3d reverb DSP's in the system. (NOTE: CURREN TLY DISABLED / UNUSED) */	int max3DReverbDSPs; /* [r/w] Optional. Specify 0 to ignore. The max number of 3d reverb DSP's in the system. (NOTE: CURREN TLY DISABLED / UNUSED) */
	float HRTFMinAngle; /* [r/w] Optional. For use with FMOD_INIT_HRTF_LOWPASS. The angle range (0-360) of a 3D sound in relation to the listener, at which the HRTF function begin s to have an effect. 0 = in front of the listener. 180 = from 90 degrees to the left of the listener to 90 degrees to the right. 360 = behind the list ener. Default = 180.0. */	float HRTFMinAngle; /* [r/w] Optional. For use with FMOD_INIT_HRTF_LOWPASS. The angle range (0-360) of a 3D sound in relation to the listener, at which the HRTF function begin s to have an effect. 0 = in front of the listener. 180 = from 90 degrees to the left of the listener to 90 degrees to the right. 360 = behind the list ener. Default = 180.0. */
	float HRTFMaxAngle; /* [r/w] Optional. For use with FMOD_INIT_HRTF_LOWPASS. The angle range (0-360) of a 3D sound in relation to the listener, at which the HRTF function has m aximum effect. 0 = front of the listener. 180 = from 90 degrees to the left of the listener to 90 degrees to the right. 360 = behind the listener. Def ault = 360.0. */	float HRTFMaxAngle; /* [r/w] Optional. For use with FMOD_INIT_HRTF_LOWPASS. The angle range (0-360) of a 3D sound in relation to the listener, at which the HRTF function has m aximum effect. 0 = front of the listener. 180 = from 90 degrees to the left of the listener to 90 degrees to the right. 360 = behind the listener. Def ault = 360.0. */
	float HRTFFreq; /* [r/w] Optional. Specify 0 to ignore. For use with FMOD_INIT_HRTF_LOWPASS. The cutoff frequency of the HRTF's lowpass filter function when at maximum effect. (i.e. at HRTFMax Angle). Default = 4000.0. */	float HRTFFreq; /* [r/w] Optional. Specify 0 to ignore. For use with FMOD_INIT_HRTF_LOWPASS. The cutoff frequency of the HRTF's lowpass filter function when at maximum effect. (i.e. at HRTFMax Angle). Default = 4000.0. */
	float vol0virtualvol; /* [r/w] Optional. Specify 0 to ignore. For use with FMOD_INIT_VOL0_BECOMES_VIRTUAL. If this flag is used, and the volume is 0.0, then the sound will become virtual. Use this value to raise the threshold to a different point where a sound goes virtua l. */	float vol0virtualvol; /* [r/w] Optional. Specify 0 to ignore. For use with FMOD_INIT_VOL0_BECOMES_VIRTUAL. If this flag is used, and the volume is 0.0, then the sound will become virtual. Use this value to raise the threshold to a different point where a sound goes virtua l. */
	int eventqueuesize; /* [r/w] Optional. Specify 0 to ignore. For use with FMOD Event system only. Specifies the number of slots available for simultaneous non blocking loads, across all threads. D efault = 32. */	int eventqueuesize; /* [r/w] Optional. Specify 0 to ignore. For use with FMOD Event system only. Specifies the number of slots available for simultaneous non blocking loads, across all threads. D efault = 32. */

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