fmod: headers diff between 43100 and 43101 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 0x00043100	#define FMOD_VERSION 0x00043101

	/*	/*
	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 366	skipping to change at line 366
	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_PULSEAUDIO, /* Linux/Linux64 - PulseAudio 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_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_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;

	skipping to change at line 1127	skipping to change at line 1128

	[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.

End of changes. 3 change blocks.
	5 lines changed or deleted	6 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 0x00043100	#define FMOD_EVENT_VERSION 0x00043101

	/*	/*
	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 1046	skipping to change at line 1046
	FMOD_RESULT F_API FMOD_EventReverb_SetUserData (FMOD_EVENTREVERB eve ntreverb, void userdata);	FMOD_RESULT F_API FMOD_EventReverb_SetUserData (FMOD_EVENTREVERB eve ntreverb, void userdata);
	FMOD_RESULT F_API FMOD_EventReverb_GetUserData (FMOD_EVENTREVERB eve ntreverb, void *userdata);	FMOD_RESULT F_API FMOD_EventReverb_GetUserData (FMOD_EVENTREVERB eve ntreverb, void *userdata);

	FMOD_RESULT F_API FMOD_EventReverb_GetMemoryInfo (FMOD_EVENTREVERB eve ntreverb, unsigned int memorybits, unsigned int event_memorybits, unsigned int memoryused, FMOD_MEMORY_USAGE_DETAILS *memoryused_details);	FMOD_RESULT F_API FMOD_EventReverb_GetMemoryInfo (FMOD_EVENTREVERB eve ntreverb, unsigned int memorybits, unsigned int event_memorybits, unsigned int memoryused, FMOD_MEMORY_USAGE_DETAILS *memoryused_details);

	/*	/*
	'EventQueue' API	'EventQueue' API
	*/	*/

	FMOD_RESULT F_API FMOD_EventQueue_Release (FMOD_EVENTQUEUE *even tqueue);	FMOD_RESULT F_API FMOD_EventQueue_Release (FMOD_EVENTQUEUE *even tqueue);

	FMOD_RESULT F_API FMOD_EventQueue_Add (FMOD_EVENTQUEUE even tqueue, FMOD_EVENTQUEUEENTRY entry);	FMOD_RESULT F_API FMOD_EventQueue_Add (FMOD_EVENTQUEUE even tqueue, FMOD_EVENTQUEUEENTRY entry, FMOD_BOOL allow_duplicates);
	FMOD_RESULT F_API FMOD_EventQueue_Remove (FMOD_EVENTQUEUE even tqueue, FMOD_EVENTQUEUEENTRY entry);	FMOD_RESULT F_API FMOD_EventQueue_Remove (FMOD_EVENTQUEUE even tqueue, FMOD_EVENTQUEUEENTRY entry);
	FMOD_RESULT F_API FMOD_EventQueue_RemoveHead (FMOD_EVENTQUEUE *even tqueue);	FMOD_RESULT F_API FMOD_EventQueue_RemoveHead (FMOD_EVENTQUEUE *even tqueue);

	FMOD_RESULT F_API FMOD_EventQueue_Clear (FMOD_EVENTQUEUE *even	FMOD_RESULT F_API FMOD_EventQueue_Clear (FMOD_EVENTQUEUE *even
	tqueue);	tqueue, FMOD_BOOL stopallevents);
		FMOD_RESULT F_API FMOD_EventQueue_FindFirstEntry (FMOD_EVENTQUEUE *even
		tqueue, FMOD_EVENTQUEUEENTRY **entry);
		FMOD_RESULT F_API FMOD_EventQueue_FindNextEntry (FMOD_EVENTQUEUE *even
		tqueue, FMOD_EVENTQUEUEENTRY **entry);
	FMOD_RESULT F_API FMOD_EventQueue_SetPaused (FMOD_EVENTQUEUE *even tqueue, FMOD_BOOL paused);	FMOD_RESULT F_API FMOD_EventQueue_SetPaused (FMOD_EVENTQUEUE *even tqueue, FMOD_BOOL paused);
	FMOD_RESULT F_API FMOD_EventQueue_GetPaused (FMOD_EVENTQUEUE even tqueue, FMOD_BOOL paused);	FMOD_RESULT F_API FMOD_EventQueue_GetPaused (FMOD_EVENTQUEUE even tqueue, FMOD_BOOL paused);

	FMOD_RESULT F_API FMOD_EventQueue_IncludeDuckingCategory(FMOD_EVENTQUEUE e ventqueue, FMOD_EVENTCATEGORY category, float volume);	FMOD_RESULT F_API FMOD_EventQueue_IncludeDuckingCategory(FMOD_EVENTQUEUE e ventqueue, FMOD_EVENTCATEGORY category, float ducked_volume, float unducke d_volume, unsigned int duck_time, unsigned int unduck_time);
	FMOD_RESULT F_API FMOD_EventQueue_ExcludeDuckingCategory(FMOD_EVENTQUEUE e ventqueue, FMOD_EVENTCATEGORY category);	FMOD_RESULT F_API FMOD_EventQueue_ExcludeDuckingCategory(FMOD_EVENTQUEUE e ventqueue, FMOD_EVENTCATEGORY category);
	FMOD_RESULT F_API FMOD_EventQueue_SetCallback (FMOD_EVENTQUEUE even tqueue, FMOD_EVENTQUEUE_CALLBACK callback, void callbackuserdata);	FMOD_RESULT F_API FMOD_EventQueue_SetCallback (FMOD_EVENTQUEUE even tqueue, FMOD_EVENTQUEUE_CALLBACK callback, void callbackuserdata);
	FMOD_RESULT F_API FMOD_EventQueue_SetUserData (FMOD_EVENTQUEUE even tqueue, void userdata);	FMOD_RESULT F_API FMOD_EventQueue_SetUserData (FMOD_EVENTQUEUE even tqueue, void userdata);
	FMOD_RESULT F_API FMOD_EventQueue_GetUserData (FMOD_EVENTQUEUE even tqueue, void *userdata);	FMOD_RESULT F_API FMOD_EventQueue_GetUserData (FMOD_EVENTQUEUE even tqueue, void *userdata);
	FMOD_RESULT F_API FMOD_EventQueue_Dump (FMOD_EVENTQUEUE *even tqueue);	FMOD_RESULT F_API FMOD_EventQueue_Dump (FMOD_EVENTQUEUE *even tqueue);

	FMOD_RESULT F_API FMOD_EventQueue_GetMemoryInfo (FMOD_EVENTQUEUE even tqueue, unsigned int memorybits, unsigned int event_memorybits, unsigned in t memoryused, FMOD_MEMORY_USAGE_DETAILS *memoryused_details);	FMOD_RESULT F_API FMOD_EventQueue_GetMemoryInfo (FMOD_EVENTQUEUE even tqueue, unsigned int memorybits, unsigned int event_memorybits, unsigned in t memoryused, FMOD_MEMORY_USAGE_DETAILS *memoryused_details);

	/*	/*
	'EventQueueEntry' API	'EventQueueEntry' API
	*/	*/

	FMOD_RESULT F_API FMOD_EventQueueEntry_Release (FMOD_EVENTQUEUEENTRY *eventqueueentry);	FMOD_RESULT F_API FMOD_EventQueueEntry_Release (FMOD_EVENTQUEUEENTRY *eventqueueentry);
	FMOD_RESULT F_API FMOD_EventQueueEntry_GetInfoOnlyEvent(FMOD_EVENTQUEUEENTR Y eventqueueentry, FMOD_EVENT *infoonlyevent);	FMOD_RESULT F_API FMOD_EventQueueEntry_GetInfoOnlyEvent(FMOD_EVENTQUEUEENTR Y eventqueueentry, FMOD_EVENT *infoonlyevent);
	FMOD_RESULT F_API FMOD_EventQueueEntry_GetRealEvent (FMOD_EVENTQUEUEENTRY eventqueueentry, FMOD_EVENT *realevent);	FMOD_RESULT F_API FMOD_EventQueueEntry_GetRealEvent (FMOD_EVENTQUEUEENTRY eventqueueentry, FMOD_EVENT *realevent);
	FMOD_RESULT F_API FMOD_EventQueueEntry_SetPriority (FMOD_EVENTQUEUEENTRY *eventqueueentry, unsigned char priority);	FMOD_RESULT F_API FMOD_EventQueueEntry_SetPriority (FMOD_EVENTQUEUEENTRY *eventqueueentry, unsigned char priority);

		FMOD_RESULT F_API FMOD_EventQueueEntry_GetPriority (FMOD_EVENTQUEUEENTRY eventqueueentry, unsigned char priority);
	FMOD_RESULT F_API FMOD_EventQueueEntry_SetExpiryTime (FMOD_EVENTQUEUEENTRY *eventqueueentry, unsigned int expirytime);	FMOD_RESULT F_API FMOD_EventQueueEntry_SetExpiryTime (FMOD_EVENTQUEUEENTRY *eventqueueentry, unsigned int expirytime);

	FMOD_RESULT F_API FMOD_EventQueueEntry_SetDelayTime (FMOD_EVENTQUEUEENTRY	FMOD_RESULT F_API FMOD_EventQueueEntry_GetExpiryTime (FMOD_EVENTQUEUEENTRY
	*eventqueueentry, int delay);	eventqueueentry, unsigned int expirytime);
		FMOD_RESULT F_API FMOD_EventQueueEntry_SetDelayTime (FMOD_EVENTQUEUEENTRY
		*eventqueueentry, unsigned int delay);
		FMOD_RESULT F_API FMOD_EventQueueEntry_GetDelayTime (FMOD_EVENTQUEUEENTRY
		eventqueueentry, unsigned int delay);
	FMOD_RESULT F_API FMOD_EventQueueEntry_SetInterrupt (FMOD_EVENTQUEUEENTRY *eventqueueentry, FMOD_BOOL interrupt);	FMOD_RESULT F_API FMOD_EventQueueEntry_SetInterrupt (FMOD_EVENTQUEUEENTRY *eventqueueentry, FMOD_BOOL interrupt);

		FMOD_RESULT F_API FMOD_EventQueueEntry_GetInterrupt (FMOD_EVENTQUEUEENTRY eventqueueentry, FMOD_BOOL interrupt);
	FMOD_RESULT F_API FMOD_EventQueueEntry_SetCrossfadeTime(FMOD_EVENTQUEUEENTR Y *eventqueueentry, int crossfade);	FMOD_RESULT F_API FMOD_EventQueueEntry_SetCrossfadeTime(FMOD_EVENTQUEUEENTR Y *eventqueueentry, int crossfade);

		FMOD_RESULT F_API FMOD_EventQueueEntry_GetCrossfadeTime(FMOD_EVENTQUEUEENTR Y eventqueueentry, int crossfade);
	FMOD_RESULT F_API FMOD_EventQueueEntry_SetUserData (FMOD_EVENTQUEUEENTRY eventqueueentry, void userdata);	FMOD_RESULT F_API FMOD_EventQueueEntry_SetUserData (FMOD_EVENTQUEUEENTRY eventqueueentry, void userdata);
	FMOD_RESULT F_API FMOD_EventQueueEntry_GetUserData (FMOD_EVENTQUEUEENTRY eventqueueentry, void *userdata);	FMOD_RESULT F_API FMOD_EventQueueEntry_GetUserData (FMOD_EVENTQUEUEENTRY eventqueueentry, void *userdata);

	FMOD_RESULT F_API FMOD_EventQueueEntry_GetMemoryInfo (FMOD_EVENTQUEUEENTRY eventqueueentry, unsigned int memorybits, unsigned int event_memorybits, u nsigned int memoryused, FMOD_MEMORY_USAGE_DETAILS *memoryused_details);	FMOD_RESULT F_API FMOD_EventQueueEntry_GetMemoryInfo (FMOD_EVENTQUEUEENTRY eventqueueentry, unsigned int memorybits, unsigned int event_memorybits, u nsigned int memoryused, FMOD_MEMORY_USAGE_DETAILS *memoryused_details);

	/*	/*
	'MusicSystem' API	'MusicSystem' API
	*/	*/

	FMOD_RESULT F_API FMOD_MusicSystem_Reset (FMOD_MUSICSYSTEM *mus icsystem);	FMOD_RESULT F_API FMOD_MusicSystem_Reset (FMOD_MUSICSYSTEM *mus icsystem);

End of changes. 8 change blocks.
	7 lines changed or deleted	18 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 0x00043100	#define FMOD_EVENT_NET_VERSION 0x00043101

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