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 0x00043305 #define FMOD_VERSION 0x00043306
/* /*
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 2070 skipping to change at line 2070
FMOD_RESULT F_API FMOD_Sound_Get3DCustomRolloff (FMOD_SOUND *sound, FM OD_VECTOR **points, int *numpoints); FMOD_RESULT F_API FMOD_Sound_Get3DCustomRolloff (FMOD_SOUND *sound, FM OD_VECTOR **points, int *numpoints);
FMOD_RESULT F_API FMOD_Sound_SetSubSound (FMOD_SOUND *sound, in t index, FMOD_SOUND *subsound); FMOD_RESULT F_API FMOD_Sound_SetSubSound (FMOD_SOUND *sound, in t index, FMOD_SOUND *subsound);
FMOD_RESULT F_API FMOD_Sound_GetSubSound (FMOD_SOUND *sound, in t index, FMOD_SOUND **subsound); FMOD_RESULT F_API FMOD_Sound_GetSubSound (FMOD_SOUND *sound, in t index, FMOD_SOUND **subsound);
FMOD_RESULT F_API FMOD_Sound_SetSubSoundSentence (FMOD_SOUND *sound, in t *subsoundlist, int numsubsounds); FMOD_RESULT F_API FMOD_Sound_SetSubSoundSentence (FMOD_SOUND *sound, in t *subsoundlist, int numsubsounds);
FMOD_RESULT F_API FMOD_Sound_GetName (FMOD_SOUND *sound, ch ar *name, int namelen); FMOD_RESULT F_API FMOD_Sound_GetName (FMOD_SOUND *sound, ch ar *name, int namelen);
FMOD_RESULT F_API FMOD_Sound_GetLength (FMOD_SOUND *sound, un signed int *length, FMOD_TIMEUNIT lengthtype); FMOD_RESULT F_API FMOD_Sound_GetLength (FMOD_SOUND *sound, un signed int *length, FMOD_TIMEUNIT lengthtype);
FMOD_RESULT F_API FMOD_Sound_GetFormat (FMOD_SOUND *sound, FM OD_SOUND_TYPE *type, FMOD_SOUND_FORMAT *format, int *channels, int *bits); FMOD_RESULT F_API FMOD_Sound_GetFormat (FMOD_SOUND *sound, FM OD_SOUND_TYPE *type, FMOD_SOUND_FORMAT *format, int *channels, int *bits);
FMOD_RESULT F_API FMOD_Sound_GetNumSubSounds (FMOD_SOUND *sound, in t *numsubsounds); FMOD_RESULT F_API FMOD_Sound_GetNumSubSounds (FMOD_SOUND *sound, in t *numsubsounds);
FMOD_RESULT F_API FMOD_Sound_GetNumTags (FMOD_SOUND *sound, in t *numtags, int *numtagsupdated); FMOD_RESULT F_API FMOD_Sound_GetNumTags (FMOD_SOUND *sound, in t *numtags, int *numtagsupdated);
FMOD_RESULT F_API FMOD_Sound_GetTag (FMOD_SOUND *sound, co nst char *name, int index, FMOD_TAG *tag); FMOD_RESULT F_API FMOD_Sound_GetTag (FMOD_SOUND *sound, co nst char *name, int index, FMOD_TAG *tag);
FMOD_RESULT F_API FMOD_Sound_GetOpenState (FMOD_SOUND *sound, FM OD_OPENSTATE *openstate, unsigned int *percentbuffered, FMOD_BOOL *starving ); FMOD_RESULT F_API FMOD_Sound_GetOpenState (FMOD_SOUND *sound, FM OD_OPENSTATE *openstate, unsigned int *percentbuffered, FMOD_BOOL *starving , FMOD_BOOL *diskbusy);
FMOD_RESULT F_API FMOD_Sound_ReadData (FMOD_SOUND *sound, vo id *buffer, unsigned int lenbytes, unsigned int *read); FMOD_RESULT F_API FMOD_Sound_ReadData (FMOD_SOUND *sound, vo id *buffer, unsigned int lenbytes, unsigned int *read);
FMOD_RESULT F_API FMOD_Sound_SeekData (FMOD_SOUND *sound, un signed int pcm); FMOD_RESULT F_API FMOD_Sound_SeekData (FMOD_SOUND *sound, un signed int pcm);
FMOD_RESULT F_API FMOD_Sound_SetSoundGroup (FMOD_SOUND *sound, FM OD_SOUNDGROUP *soundgroup); FMOD_RESULT F_API FMOD_Sound_SetSoundGroup (FMOD_SOUND *sound, FM OD_SOUNDGROUP *soundgroup);
FMOD_RESULT F_API FMOD_Sound_GetSoundGroup (FMOD_SOUND *sound, FM OD_SOUNDGROUP **soundgroup); FMOD_RESULT F_API FMOD_Sound_GetSoundGroup (FMOD_SOUND *sound, FM OD_SOUNDGROUP **soundgroup);
/* /*
Synchronization point API. These points can come from markers embedde d in wav files, and can also generate channel callbacks. Synchronization point API. These points can come from markers embedde d in wav files, and can also generate channel callbacks.
*/ */
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 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 0x00043305 #define FMOD_EVENT_VERSION 0x00043306
/* /*
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 798 skipping to change at line 798
] ]
*/ */
typedef struct FMOD_MUSIC_SAMPLE_INFO typedef struct FMOD_MUSIC_SAMPLE_INFO
{ {
unsigned int segment_id; /* The ID of the parent segment. */ unsigned int segment_id; /* The ID of the parent segment. */
unsigned int index; /* The index of the sample within the paren t segment. */ unsigned int index; /* The index of the sample within the paren t segment. */
const char *filename; /* The filename of the sample.<br/> <b>Note :</b> If the sample was built by a version of FMOD Designer before 4.29.09, this field will be 0. */ const char *filename; /* The filename of the sample.<br/> <b>Note :</b> If the sample was built by a version of FMOD Designer before 4.29.09, this field will be 0. */
} FMOD_MUSIC_SAMPLE_INFO; } FMOD_MUSIC_SAMPLE_INFO;
/* /*
[STRUCTURE]
[
[DESCRIPTION]
Structure containing information about a music segment, for use with
FMOD_MUSIC_CALLBACKTYPE_CHANNEL_CREATED and FMOD_MUSIC_CALLBACKTYPE_CHA
NNEL_DESTROYED.
[REMARKS]
[PLATFORMS]
Win32, Win64, Linux, Linux64, Macintosh, Xbox, Xbox360, PlayStation 2,
GameCube, PlayStation Portable, PlayStation 3
[SEE_ALSO]
FMOD_MUSIC_CALLBACK
FMOD_MUSIC_CALLBACKTYPE
]
*/
typedef struct FMOD_MUSIC_SEGMENT_INFO
{
unsigned int segment_id; /* The ID of the segment. */
unsigned int theme_id; /* The ID of the parent theme. */
} FMOD_MUSIC_SEGMENT_INFO;
/*
[ENUM] [ENUM]
[ [
[DESCRIPTION] [DESCRIPTION]
These callback types are used with FMOD_MUSIC_CALLBACK. These callback types are used with FMOD_MUSIC_CALLBACK.
[REMARKS] [REMARKS]
<b>Note!</b> Currently the user must call EventSystem::update for thes e callbacks to trigger!<br /> <b>Note!</b> Currently the user must call EventSystem::update for thes e callbacks to trigger!<br />
[PLATFORMS] [PLATFORMS]
Win32, Win64, Linux, Macintosh, Xbox, Xbox360, PlayStation 2, GameCube, PlayStation Portable, PlayStation 3, Wii, Wii Win32, Win64, Linux, Macintosh, Xbox, Xbox360, PlayStation 2, GameCube, PlayStation Portable, PlayStation 3, Wii, Wii
skipping to change at line 821 skipping to change at line 844
FMOD_MUSIC_CALLBACK FMOD_MUSIC_CALLBACK
EventSystem::update EventSystem::update
] ]
*/ */
typedef enum typedef enum
{ {
FMOD_MUSIC_CALLBACKTYPE_SEGMENT_START, /* Called when a segment i s started. */ FMOD_MUSIC_CALLBACKTYPE_SEGMENT_START, /* Called when a segment i s started. */
FMOD_MUSIC_CALLBACKTYPE_SEGMENT_END, /* Called when a segment e nds. */ FMOD_MUSIC_CALLBACKTYPE_SEGMENT_END, /* Called when a segment e nds. */
FMOD_MUSIC_CALLBACKTYPE_SAMPLE_CREATE, /* Called when a segment n eeds a sound created. */ FMOD_MUSIC_CALLBACKTYPE_SAMPLE_CREATE, /* Called when a segment n eeds a sound created. */
FMOD_MUSIC_CALLBACKTYPE_SAMPLE_RELEASE, /* Called when a segment i s finished with a sound. */ FMOD_MUSIC_CALLBACKTYPE_SAMPLE_RELEASE, /* Called when a segment i s finished with a sound. */
FMOD_MUSIC_CALLBACKTYPE_CHANNEL_CREATED, /* Called when a channel i
s created to play a segment. */
FMOD_MUSIC_CALLBACKTYPE_CHANNEL_DESTROYED, /* Called when a segment c
hannel is destroyed. */
FMOD_MUSIC_CALLBACKTYPE_RESET, /* Called when the system is reset */ FMOD_MUSIC_CALLBACKTYPE_RESET, /* Called when the system is reset */
FMOD_MUSIC_CALLBACKTYPE_BEAT, /* Called each time a beat is passed (based on segment tempo and time signature) */ FMOD_MUSIC_CALLBACKTYPE_BEAT, /* Called each time a beat is passed (based on segment tempo and time signature) */
} FMOD_MUSIC_CALLBACKTYPE; } FMOD_MUSIC_CALLBACKTYPE;
typedef FMOD_RESULT (F_CALLBACK *FMOD_MUSIC_CALLBACK) (FMOD_MUSIC_CALLBACKT YPE type, void *param1, void *param2, void *userdata); typedef FMOD_RESULT (F_CALLBACK *FMOD_MUSIC_CALLBACK) (FMOD_MUSIC_CALLBACKT YPE type, void *param1, void *param2, void *userdata);
/* ======================================================================== ================== */ /* ======================================================================== ================== */
/* FUNCTION PROTOTYPES */ /* FUNCTION PROTOTYPES */
/* ======================================================================== ================== */ /* ======================================================================== ================== */
 End of changes. 3 change blocks. 
1 lines changed or deleted 30 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 0x00043305 #define FMOD_EVENT_NET_VERSION 0x00043306
/* /*
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/