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 0x00044105 #define FMOD_VERSION 0x00044106
/* /*
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 )
#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(_W IN64) #elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(_W IN64)
#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 )
#elif defined(__MACH__) || defined(__ANDROID__) || defined(__linux__) #elif defined(__MACH__) || defined(__ANDROID__) || defined(__linux__) || de fined(__QNX__)
#define F_CDECL #define F_CDECL
#define F_STDCALL #define F_STDCALL
#define F_DECLSPEC #define F_DECLSPEC
#define F_DLLEXPORT __attribute__ ((visibility("default"))) #define F_DLLEXPORT __attribute__ ((visibility("default")))
#else #else
#define F_CDECL #define F_CDECL
#define F_STDCALL #define F_STDCALL
#define F_DECLSPEC #define F_DECLSPEC
#define F_DLLEXPORT #define F_DLLEXPORT
#endif #endif
#ifdef DLL_EXPORTS #ifdef DLL_EXPORTS
#if defined(__MACH__) || defined(__ANDROID__) || defined(__linux__) #if defined(__MACH__) || defined(__ANDROID__) || defined(__linux__) || defined(__QNX__)
#define F_API __attribute__ ((visibility("default"))) #define F_API __attribute__ ((visibility("default")))
#else #else
#define F_API __declspec(dllexport) F_STDCALL #define F_API __declspec(dllexport) F_STDCALL
#endif #endif
#else #else
#define F_API F_STDCALL #define F_API F_STDCALL
#endif #endif
#define F_CALLBACK F_STDCALL #define F_CALLBACK F_STDCALL
skipping to change at line 374 skipping to change at line 374
FMOD_OUTPUTTYPE_XBOX360, /* Xbox 360 - Native Xbox360 ou tput. (Default on Xbox 360) */ FMOD_OUTPUTTYPE_XBOX360, /* Xbox 360 - Native Xbox360 ou tput. (Default on Xbox 360) */
FMOD_OUTPUTTYPE_PSP, /* PSP - Native PSP output . (Default on PSP) */ FMOD_OUTPUTTYPE_PSP, /* PSP - Native PSP output . (Default on PSP) */
FMOD_OUTPUTTYPE_PS3, /* PS3 - Native PS3 output . (Default on PS3) */ FMOD_OUTPUTTYPE_PS3, /* PS3 - Native PS3 output . (Default on PS3) */
FMOD_OUTPUTTYPE_NGP, /* NGP - Native NGP output . (Default on NGP) */ FMOD_OUTPUTTYPE_NGP, /* NGP - Native NGP output . (Default on NGP) */
FMOD_OUTPUTTYPE_WII, /* Wii - Native Wii output. (Default on Wii) */ FMOD_OUTPUTTYPE_WII, /* Wii - Native Wii output. (Default on Wii) */
FMOD_OUTPUTTYPE_3DS, /* 3DS - Native 3DS output (Default on 3DS) */ FMOD_OUTPUTTYPE_3DS, /* 3DS - Native 3DS output (Default on 3DS) */
FMOD_OUTPUTTYPE_AUDIOTRACK, /* Android - Java Audio Track output. (Default on Android 2.2 and below) */ FMOD_OUTPUTTYPE_AUDIOTRACK, /* Android - Java Audio Track output. (Default on Android 2.2 and below) */
FMOD_OUTPUTTYPE_OPENSL, /* Android - OpenSL ES output. (Default on Android 2.3 and above) */ FMOD_OUTPUTTYPE_OPENSL, /* Android - OpenSL ES output. (Default on Android 2.3 and above) */
FMOD_OUTPUTTYPE_NACL, /* Native Client - Native Client out put. (Default on Native Client) */ FMOD_OUTPUTTYPE_NACL, /* Native Client - Native Client out put. (Default on Native Client) */
FMOD_OUTPUTTYPE_WIIU, /* Wii U - Native Wii U outp ut. (Default on Wii U) */ FMOD_OUTPUTTYPE_WIIU, /* Wii U - Native Wii U outp ut. (Default on Wii U) */
FMOD_OUTPUTTYPE_ASOUND, /* BlackBerry - Native BlackBerry asound output. (Default on BlackBerry) */
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]
[ [
[NAME] [NAME]
FMOD_CAPS FMOD_CAPS
skipping to change at line 775 skipping to change at line 776
FMOD_SOUND_TYPE_USER, /* User created sound. */ FMOD_SOUND_TYPE_USER, /* User created sound. */
FMOD_SOUND_TYPE_WAV, /* Microsoft WAV. */ FMOD_SOUND_TYPE_WAV, /* Microsoft WAV. */
FMOD_SOUND_TYPE_XM, /* FastTracker 2 XM. */ FMOD_SOUND_TYPE_XM, /* FastTracker 2 XM. */
FMOD_SOUND_TYPE_XMA, /* Xbox360 XMA */ FMOD_SOUND_TYPE_XMA, /* Xbox360 XMA */
FMOD_SOUND_TYPE_VAG, /* PlayStation Portable ADPCM VAG form at. */ FMOD_SOUND_TYPE_VAG, /* PlayStation Portable ADPCM VAG form at. */
FMOD_SOUND_TYPE_AUDIOQUEUE, /* iPhone hardware decoder, supports A AC, ALAC and MP3. extracodecdata is a pointer to an FMOD_AUDIOQUEUE_EXTRACO DECDATA structure. */ FMOD_SOUND_TYPE_AUDIOQUEUE, /* iPhone hardware decoder, supports A AC, ALAC and MP3. extracodecdata is a pointer to an FMOD_AUDIOQUEUE_EXTRACO DECDATA structure. */
FMOD_SOUND_TYPE_XWMA, /* Xbox360 XWMA */ FMOD_SOUND_TYPE_XWMA, /* Xbox360 XWMA */
FMOD_SOUND_TYPE_BCWAV, /* 3DS BCWAV container format for DSP ADPCM and PCM */ FMOD_SOUND_TYPE_BCWAV, /* 3DS BCWAV container format for DSP ADPCM and PCM */
FMOD_SOUND_TYPE_AT9, /* NGP ATRAC 9 format */ FMOD_SOUND_TYPE_AT9, /* NGP ATRAC 9 format */
FMOD_SOUND_TYPE_VORBIS, /* Raw vorbis */ FMOD_SOUND_TYPE_VORBIS, /* Raw vorbis */
FMOD_SOUND_TYPE_MEDIA_FOUNDATION,/* Microsoft Media Foundation wrappers , supports ASF/WMA */
FMOD_SOUND_TYPE_MAX, /* Maximum number of sound types suppo rted. */ FMOD_SOUND_TYPE_MAX, /* Maximum number of sound types suppo rted. */
FMOD_SOUND_TYPE_FORCEINT = 65536 /* Makes sure this enum is signed 32bi t. */ FMOD_SOUND_TYPE_FORCEINT = 65536 /* Makes sure this enum is signed 32bi t. */
} FMOD_SOUND_TYPE; } FMOD_SOUND_TYPE;
/* /*
[ENUM] [ENUM]
[ [
[DESCRIPTION] [DESCRIPTION]
These definitions describe the native format of the hardware or softwar e buffer that will be used. These definitions describe the native format of the hardware or softwar e buffer that will be used.
 End of changes. 5 change blocks. 
3 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 0x00044105 #define FMOD_EVENT_VERSION 0x00044106
/* /*
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 0x00044105 #define FMOD_EVENT_NET_VERSION 0x00044106
/* /*
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/