FMOD Ex: headers diff between 43907 and 44000 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 0x00043907	#define FMOD_VERSION 0x00044000

	/*	/*
	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 192	skipping to change at line 192

	FMOD_ERR_EVENT_FAILED, /* An Event failed to be retrieved, mos t likely due to 'just fail' being specified as the max playbacks behavior. */	FMOD_ERR_EVENT_FAILED, /* An Event failed to be retrieved, mos t likely due to 'just fail' being specified as the max playbacks behavior. */
	FMOD_ERR_EVENT_INFOONLY, /* Can't execute this command on an EVE NT_INFOONLY event. */	FMOD_ERR_EVENT_INFOONLY, /* Can't execute this command on an EVE NT_INFOONLY event. */
	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 or bank has al ready been loaded. Having multiple copies of the same project loaded simult aneously 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_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_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 $/

	/*	/*

End of changes. 2 change blocks.
	2 lines changed or deleted	2 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 0x00043907	#define FMOD_EVENT_NET_VERSION 0x00044000

	/*	/*
	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_errors.h	fmod_errors.h

	skipping to change at line 43	skipping to change at line 43
	case FMOD_ERR_CDDA_READ: return "A CDDA read error occ urred. ";	case FMOD_ERR_CDDA_READ: return "A CDDA read error occ urred. ";
	case FMOD_ERR_CHANNEL_ALLOC: return "Error trying to alloc ate a channel. ";	case FMOD_ERR_CHANNEL_ALLOC: return "Error trying to alloc ate a channel. ";
	case FMOD_ERR_CHANNEL_STOLEN: return "The specified channel has been reused to play another sound. ";	case FMOD_ERR_CHANNEL_STOLEN: return "The specified channel has been reused to play another sound. ";
	case FMOD_ERR_COM: return "A Win32 COM related e rror occured. COM failed to initialize or a QueryInterface failed meaning a Windows codec or driver was not installed properly. ";	case FMOD_ERR_COM: return "A Win32 COM related e rror occured. COM failed to initialize or a QueryInterface failed meaning a Windows codec or driver was not installed properly. ";
	case FMOD_ERR_DMA: return "DMA Failure. See deb ug output for more information. ";	case FMOD_ERR_DMA: return "DMA Failure. See deb ug output for more information. ";
	case FMOD_ERR_DSP_CONNECTION: return "DSP connection error. Connection possibly caused a cyclic dependancy. Or tried to connect a tr ee too many units deep (more than 128). ";	case FMOD_ERR_DSP_CONNECTION: return "DSP connection error. Connection possibly caused a cyclic dependancy. Or tried to connect a tr ee too many units deep (more than 128). ";
	case FMOD_ERR_DSP_FORMAT: return "DSP Format error. A DSP unit may have attempted to connect to this network with the wrong forma t. ";	case FMOD_ERR_DSP_FORMAT: return "DSP Format error. A DSP unit may have attempted to connect to this network with the wrong forma t. ";
	case FMOD_ERR_DSP_NOTFOUND: return "DSP connection error. Couldn't find the DSP unit specified. ";	case FMOD_ERR_DSP_NOTFOUND: return "DSP connection error. Couldn't find the DSP unit specified. ";
	case FMOD_ERR_DSP_RUNNING: return "DSP error. Cannot pe rform this operation while the network is in the middle of running. This w ill most likely happen if a connection or disconnection is attempted in a D SP callback. ";	case FMOD_ERR_DSP_RUNNING: return "DSP error. Cannot pe rform this operation while the network is in the middle of running. This w ill most likely happen if a connection or disconnection is attempted in a D SP callback. ";
	case FMOD_ERR_DSP_TOOMANYCONNECTIONS: return "DSP connection error. The unit being connected to or disconnected should only have 1 input or o utput. ";	case FMOD_ERR_DSP_TOOMANYCONNECTIONS: return "DSP connection error. The unit being connected to or disconnected should only have 1 input or o utput. ";

	case FMOD_ERR_EVENT_ALREADY_LOADED: return "The specified project has already been loaded. Having multiple copies of the same project loaded simultaneously is forbidden. ";	case FMOD_ERR_EVENT_ALREADY_LOADED: return "The specified project or bank has already been loaded. Having multiple copies of the same projec t loaded simultaneously is forbidden. ";
	case FMOD_ERR_EVENT_FAILED: return "An Event failed to be retrieved, most likely due to 'just fail' being specified as the max playb acks behavior. ";	case FMOD_ERR_EVENT_FAILED: return "An Event failed to be retrieved, most likely due to 'just fail' being specified as the max playb acks behavior. ";
	case FMOD_ERR_EVENT_GUIDCONFLICT: return "An event with the sam e GUID already exists. ";	case FMOD_ERR_EVENT_GUIDCONFLICT: return "An event with the sam e GUID already exists. ";
	case FMOD_ERR_EVENT_INFOONLY: return "Can't execute this co mmand on an EVENT_INFOONLY event. ";	case FMOD_ERR_EVENT_INFOONLY: return "Can't execute this co mmand on an EVENT_INFOONLY event. ";
	case FMOD_ERR_EVENT_INTERNAL: return "An error occured that wasn't supposed to. See debug log for reason. ";	case FMOD_ERR_EVENT_INTERNAL: return "An error occured that wasn't supposed to. See debug log for reason. ";
	case FMOD_ERR_EVENT_MAXSTREAMS: return "Event failed because 'Max streams' was hit when FMOD_EVENT_INIT_FAIL_ON_MAXSTREAMS was specified . ";	case FMOD_ERR_EVENT_MAXSTREAMS: return "Event failed because 'Max streams' was hit when FMOD_EVENT_INIT_FAIL_ON_MAXSTREAMS was specified . ";
	case FMOD_ERR_EVENT_MISMATCH: return "FSB mismatches the FE V it was compiled with, the stream/sample mode it was meant to be created w ith was different, or the FEV was built for a different platform. ";	case FMOD_ERR_EVENT_MISMATCH: return "FSB mismatches the FE V it was compiled with, the stream/sample mode it was meant to be created w ith was different, or the FEV was built for a different platform. ";
	case FMOD_ERR_EVENT_NAMECONFLICT: return "A category with the s ame name already exists. ";	case FMOD_ERR_EVENT_NAMECONFLICT: return "A category with the s ame name already exists. ";
	case FMOD_ERR_EVENT_NEEDSSIMPLE: return "Tried to call a funct ion on a complex event that's only supported by simple events. ";	case FMOD_ERR_EVENT_NEEDSSIMPLE: return "Tried to call a funct ion on a complex event that's only supported by simple events. ";
	case FMOD_ERR_EVENT_NOTFOUND: return "The requested event, event group, event category or event property could not be found. ";	case FMOD_ERR_EVENT_NOTFOUND: return "The requested event, event group, event category or event property could not be found. ";
	case FMOD_ERR_FILE_BAD: return "Error loading file. " ;	case FMOD_ERR_FILE_BAD: return "Error loading file. " ;

End of changes. 1 change blocks.
	1 lines changed or deleted	1 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 0x00043907	#define FMOD_EVENT_VERSION 0x00044000

	/*	/*
	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 970	skipping to change at line 970
	Get/set user data	Get/set user data
	*/	*/

	FMOD_RESULT F_API FMOD_EventSystem_SetUserData (FMOD_EVENTSYSTEM eve ntsystem, void userdata);	FMOD_RESULT F_API FMOD_EventSystem_SetUserData (FMOD_EVENTSYSTEM eve ntsystem, void userdata);
	FMOD_RESULT F_API FMOD_EventSystem_GetUserData (FMOD_EVENTSYSTEM eve ntsystem, void *userdata);	FMOD_RESULT F_API FMOD_EventSystem_GetUserData (FMOD_EVENTSYSTEM eve ntsystem, void *userdata);

	/*	/*
	Pre-loading FSB files (from disk or from memory, use FMOD_OPENMEMORY_P OINT to point to pre-loaded memory).	Pre-loading FSB files (from disk or from memory, use FMOD_OPENMEMORY_P OINT to point to pre-loaded memory).
	*/	*/


	FMOD_RESULT F_API FMOD_EventSystem_PreloadFSB (FMOD_EVENTSYSTEM eve ntsystem, const char filename, int streaminstance, FMOD_SOUND *sound);	FMOD_RESULT F_API FMOD_EventSystem_PreloadFSB (FMOD_EVENTSYSTEM eve ntsystem, const char filename, int streaminstance, FMOD_SOUND *sound, FMOD _BOOL unloadprevious);
	FMOD_RESULT F_API FMOD_EventSystem_UnloadFSB (FMOD_EVENTSYSTEM eve ntsystem, const char filename, int streaminstance);	FMOD_RESULT F_API FMOD_EventSystem_UnloadFSB (FMOD_EVENTSYSTEM eve ntsystem, const char filename, int streaminstance);

	FMOD_RESULT F_API FMOD_EventSystem_GetMemoryInfo (FMOD_EVENTSYSTEM eve ntsystem, unsigned int memorybits, unsigned int event_memorybits, unsigned int memoryused, FMOD_MEMORY_USAGE_DETAILS *memoryused_details);	FMOD_RESULT F_API FMOD_EventSystem_GetMemoryInfo (FMOD_EVENTSYSTEM eve ntsystem, unsigned int memorybits, unsigned int event_memorybits, unsigned int memoryused, FMOD_MEMORY_USAGE_DETAILS *memoryused_details);

	/*	/*
	'EventProject' API	'EventProject' API
	*/	*/

	FMOD_RESULT F_API FMOD_EventProject_Release (FMOD_EVENTPROJECT *ev entproject);	FMOD_RESULT F_API FMOD_EventProject_Release (FMOD_EVENTPROJECT *ev entproject);
	FMOD_RESULT F_API FMOD_EventProject_GetInfo (FMOD_EVENTPROJECT ev entproject, FMOD_EVENT_PROJECTINFO info);	FMOD_RESULT F_API FMOD_EventProject_GetInfo (FMOD_EVENTPROJECT ev entproject, FMOD_EVENT_PROJECTINFO info);

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

	fmod_event.hpp	fmod_event.hpp

	skipping to change at line 104	skipping to change at line 104
	FMOD_RESULT F_API set3DNumListeners (int numlisteners);	FMOD_RESULT F_API set3DNumListeners (int numlisteners);
	FMOD_RESULT F_API get3DNumListeners (int *numlisteners);	FMOD_RESULT F_API get3DNumListeners (int *numlisteners);
	FMOD_RESULT F_API set3DListenerAttributes (int listener, const FM OD_VECTOR pos, const FMOD_VECTOR vel, const FMOD_VECTOR forward, const F MOD_VECTOR up);	FMOD_RESULT F_API set3DListenerAttributes (int listener, const FM OD_VECTOR pos, const FMOD_VECTOR vel, const FMOD_VECTOR forward, const F MOD_VECTOR up);
	FMOD_RESULT F_API get3DListenerAttributes (int listener, FMOD_VEC TOR pos, FMOD_VECTOR vel, FMOD_VECTOR forward, FMOD_VECTOR up);	FMOD_RESULT F_API get3DListenerAttributes (int listener, FMOD_VEC TOR pos, FMOD_VECTOR vel, FMOD_VECTOR forward, FMOD_VECTOR up);

	// Get/set user data	// Get/set user data
	FMOD_RESULT F_API setUserData (void *userdata);	FMOD_RESULT F_API setUserData (void *userdata);
	FMOD_RESULT F_API getUserData (void **userdata);	FMOD_RESULT F_API getUserData (void **userdata);

	// Pre-loading FSB files (from disk or from memory, use FMOD_OPENME MORY_POINT to point to pre-loaded memory).	// Pre-loading FSB files (from disk or from memory, use FMOD_OPENME MORY_POINT to point to pre-loaded memory).

	FMOD_RESULT F_API preloadFSB (const char filename, int streaminstance, Sound sound);	FMOD_RESULT F_API preloadFSB (const char filename, int streaminstance, Sound sound, bool unloadprevious = false);
	FMOD_RESULT F_API unloadFSB (const char *filename, int streaminstance);	FMOD_RESULT F_API unloadFSB (const char *filename, int streaminstance);

	FMOD_RESULT F_API getMemoryInfo (unsigned int memorybit s, unsigned int event_memorybits, unsigned int memoryused, FMOD_MEMORY_USA GE_DETAILS memoryused_details);	FMOD_RESULT F_API getMemoryInfo (unsigned int memorybit s, unsigned int event_memorybits, unsigned int memoryused, FMOD_MEMORY_USA GE_DETAILS memoryused_details);
	};	};

	/*	/*
	'EventProject' API	'EventProject' API
	*/	*/
	class EventProject	class EventProject
	{	{

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