| 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 0x00043102 | | #define FMOD_VERSION 0x00043103 | |
| | | | |
| /* | | /* | |
| 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 921 | | skipping to change at line 921 | |
|---|
| ] | | ] | |
| */ | | */ | |
| typedef enum | | typedef enum | |
| { | | { | |
| FMOD_OPENSTATE_READY = 0, /* Opened and ready to play. */ | | FMOD_OPENSTATE_READY = 0, /* Opened and ready to play. */ | |
| FMOD_OPENSTATE_LOADING, /* Initial load in progress. */ | | FMOD_OPENSTATE_LOADING, /* Initial load in progress. */ | |
| FMOD_OPENSTATE_ERROR, /* Failed to open - file not found, out
of memory etc. See return value of Sound::getOpenState for what happened.
*/ | | FMOD_OPENSTATE_ERROR, /* Failed to open - file not found, out
of memory etc. See return value of Sound::getOpenState for what happened.
*/ | |
| FMOD_OPENSTATE_CONNECTING, /* Connecting to remote host (internet
sounds only). */ | | FMOD_OPENSTATE_CONNECTING, /* Connecting to remote host (internet
sounds only). */ | |
| FMOD_OPENSTATE_BUFFERING, /* Buffering data. */ | | FMOD_OPENSTATE_BUFFERING, /* Buffering data. */ | |
| FMOD_OPENSTATE_SEEKING, /* Seeking to subsound and re-flushing
stream buffer. */ | | FMOD_OPENSTATE_SEEKING, /* Seeking to subsound and re-flushing
stream buffer. */ | |
|
| FMOD_OPENSTATE_STREAMING, /* Ready and playing, but not possible
to release at this time without stalling the main thread. */ | | FMOD_OPENSTATE_PLAYING, /* Ready and playing, but not possible
to release at this time without stalling the main thread. */ | |
| FMOD_OPENSTATE_SETPOSITION, /* Seeking within a stream to a differe
nt position. */ | | FMOD_OPENSTATE_SETPOSITION, /* Seeking within a stream to a differe
nt position. */ | |
| | | | |
| FMOD_OPENSTATE_MAX, /* Maximum number of open state types.
*/ | | FMOD_OPENSTATE_MAX, /* Maximum number of open state types.
*/ | |
| FMOD_OPENSTATE_FORCEINT = 65536 /* Makes sure this enum is signed 32bit
. */ | | FMOD_OPENSTATE_FORCEINT = 65536 /* Makes sure this enum is signed 32bit
. */ | |
| } FMOD_OPENSTATE; | | } FMOD_OPENSTATE; | |
| | | | |
| /* | | /* | |
| [ENUM] | | [ENUM] | |
| [ | | [ | |
| [DESCRIPTION] | | [DESCRIPTION] | |
| | | | |
| 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 0x00043102 | | #define FMOD_EVENT_VERSION 0x00043103 | |
| | | | |
| /* | | /* | |
| 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 518 | | skipping to change at line 518 | |
|---|
| Win32, Win64, Linux, Linux64, Macintosh, Xbox, Xbox360, PlayStation 2,
GameCube, PlayStation Portable, PlayStation 3 | | Win32, Win64, Linux, Linux64, Macintosh, Xbox, Xbox360, PlayStation 2,
GameCube, PlayStation Portable, PlayStation 3 | |
| | | | |
| [SEE_ALSO] | | [SEE_ALSO] | |
| Event::getInfo | | Event::getInfo | |
| FMOD_GUID | | FMOD_GUID | |
| ] | | ] | |
| */ | | */ | |
| typedef struct FMOD_EVENT_INFO | | typedef struct FMOD_EVENT_INFO | |
| { | | { | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
|
| FMOD_EVENT_INFO() : memoryused(0), positionms(0), lengthms(0), channels
playing(0), instancesactive(0), maxwavebanks(0), wavebankinfo(0), projectid
(0), systemid(0), audibility(0), numinstances(0), instances(0), guid(0) {} | | FMOD_EVENT_INFO() : memoryused(0), positionms(0), lengthms(0), channels
playing(0), instancesactive(0), maxwavebanks(0), wavebankinfo(0), projectid
(0), audibility(0), numinstances(0), instances(0) { guid.Data1 = guid.Data2
= guid.Data3 = guid.Data4[0] = guid.Data4[1] = guid.Data4[2] = guid.Data4[
3] = guid.Data4[5] = guid.Data4[6] = guid.Data4[7] = guid.Data4[7] = 0; } | |
| #endif | | #endif | |
| | | | |
| int memoryused; /* This member has been dep
recated. */ | | int memoryused; /* This member has been dep
recated. */ | |
| int positionms; /* [out] Time passed in pla
yback of this event instance in milliseconds. */ | | int positionms; /* [out] Time passed in pla
yback of this event instance in milliseconds. */ | |
| int lengthms; /* [out] Length in millisec
onds of this event. Note: lengthms will be -1 if the length of the event ca
n't be determined i.e. if it has looping sounds. */ | | int lengthms; /* [out] Length in millisec
onds of this event. Note: lengthms will be -1 if the length of the event ca
n't be determined i.e. if it has looping sounds. */ | |
| int channelsplaying; /* [out] Number of channels
currently playing in this event instance. */ | | int channelsplaying; /* [out] Number of channels
currently playing in this event instance. */ | |
| int instancesactive; /* [out] Number of event in
stances currently in use. */ | | int instancesactive; /* [out] Number of event in
stances currently in use. */ | |
| int maxwavebanks; /* [in/out] Out, number of
wavebanks refered to by this event. In. Maximum size of array of wavebanki
nfo structures supplied by user. Optional. */ | | int maxwavebanks; /* [in/out] Out, number of
wavebanks refered to by this event. In. Maximum size of array of wavebanki
nfo structures supplied by user. Optional. */ | |
| FMOD_EVENT_WAVEBANKINFO *wavebankinfo; /* [in] Pointer to array FM
OD_EVENT_WAVEBANKINFO structures (max size defined by maxwavebanks). FMOD
will fill these in with detailed information on each wave bank. Optional. *
/ | | FMOD_EVENT_WAVEBANKINFO *wavebankinfo; /* [in] Pointer to array FM
OD_EVENT_WAVEBANKINFO structures (max size defined by maxwavebanks). FMOD
will fill these in with detailed information on each wave bank. Optional. *
/ | |
| unsigned int projectid; /* [out] The runtime 'Event
Project' wide unique identifier for this event. */ | | unsigned int projectid; /* [out] The runtime 'Event
Project' wide unique identifier for this event. */ | |
|
| unsigned int systemid; /* [out] The runtime 'Event | | float audibility; /* [out] Current audibility | |
| System' wide unique identifier for this event. This is calculated when sin | | of this event. */ | |
| gle or multiple projects are loaded. */ | | | |
| float audibility; /* [out] current audibility | | | |
| of event. */ | | | |
| int numinstances; /* [in/out] On entry, maxim
um number of entries in instances array. On exit, actual number of entries
in instances array, or if instances is null, then it is just the number of
instances of this event. Optional. */ | | int numinstances; /* [in/out] On entry, maxim
um number of entries in instances array. On exit, actual number of entries
in instances array, or if instances is null, then it is just the number of
instances of this event. Optional. */ | |
| FMOD_EVENT **instances; /* [in/out] Pointer to an a
rray that will be filled with the current reference-counted event handles o
f all instances of this event. Optional. Specify 0 if not needed. Must be u
sed in conjunction with numinstances. Note: Due to reference counting, the
event instance handles returned here may be different between subsequent ca
lls to this function. If you use these event handles, make sure your code i
s prepared for them to be invalid! */ | | FMOD_EVENT **instances; /* [in/out] Pointer to an a
rray that will be filled with the current reference-counted event handles o
f all instances of this event. Optional. Specify 0 if not needed. Must be u
sed in conjunction with numinstances. Note: Due to reference counting, the
event instance handles returned here may be different between subsequent ca
lls to this function. If you use these event handles, make sure your code i
s prepared for them to be invalid! */ | |
|
| FMOD_GUID *guid; /* [out] Pointer to a struc | | FMOD_GUID guid; /* [out] The event's Global | |
| ture that will be filled with the event's GUID. Optional. Specify 0 if not | | ly Unique Identifier. */ | |
| needed. */ | | | |
| | | | |
| } FMOD_EVENT_INFO; | | } FMOD_EVENT_INFO; | |
| | | | |
| /* | | /* | |
| [ENUM] | | [ENUM] | |
| [ | | [ | |
| [DESCRIPTION] | | [DESCRIPTION] | |
| Sound definition entry types for FMOD_EVENT_SOUNDDEFINFO. | | Sound definition entry types for FMOD_EVENT_SOUNDDEFINFO. | |
| | | | |
| [REMARKS] | | [REMARKS] | |
| | | | |
| | | | |
| skipping to change at line 839 | | skipping to change at line 837 | |
|---|
| | | | |
| FMOD_RESULT F_API FMOD_EventSystem_GetProject (FMOD_EVENTSYSTEM *eve
ntsystem, const char *name, FMOD_EVENTPROJECT **project); | | FMOD_RESULT F_API FMOD_EventSystem_GetProject (FMOD_EVENTSYSTEM *eve
ntsystem, const char *name, FMOD_EVENTPROJECT **project); | |
| FMOD_RESULT F_API FMOD_EventSystem_GetProjectByIndex (FMOD_EVENTSYSTEM *eve
ntsystem, int index, FMOD_EVENTPROJECT **project); | | FMOD_RESULT F_API FMOD_EventSystem_GetProjectByIndex (FMOD_EVENTSYSTEM *eve
ntsystem, int index, FMOD_EVENTPROJECT **project); | |
| FMOD_RESULT F_API FMOD_EventSystem_GetNumProjects (FMOD_EVENTSYSTEM *eve
ntsystem, int *numprojects); | | FMOD_RESULT F_API FMOD_EventSystem_GetNumProjects (FMOD_EVENTSYSTEM *eve
ntsystem, int *numprojects); | |
| FMOD_RESULT F_API FMOD_EventSystem_GetCategory (FMOD_EVENTSYSTEM *eve
ntsystem, const char *name, FMOD_EVENTCATEGORY **category); | | FMOD_RESULT F_API FMOD_EventSystem_GetCategory (FMOD_EVENTSYSTEM *eve
ntsystem, const char *name, FMOD_EVENTCATEGORY **category); | |
| FMOD_RESULT F_API FMOD_EventSystem_GetCategoryByIndex(FMOD_EVENTSYSTEM *eve
ntsystem, int index, FMOD_EVENTCATEGORY **category); | | FMOD_RESULT F_API FMOD_EventSystem_GetCategoryByIndex(FMOD_EVENTSYSTEM *eve
ntsystem, int index, FMOD_EVENTCATEGORY **category); | |
| FMOD_RESULT F_API FMOD_EventSystem_GetMusicCategory (FMOD_EVENTSYSTEM *eve
ntsystem, FMOD_EVENTCATEGORY **category); | | FMOD_RESULT F_API FMOD_EventSystem_GetMusicCategory (FMOD_EVENTSYSTEM *eve
ntsystem, FMOD_EVENTCATEGORY **category); | |
| FMOD_RESULT F_API FMOD_EventSystem_GetNumCategories (FMOD_EVENTSYSTEM *eve
ntsystem, int *numcategories); | | FMOD_RESULT F_API FMOD_EventSystem_GetNumCategories (FMOD_EVENTSYSTEM *eve
ntsystem, int *numcategories); | |
| FMOD_RESULT F_API FMOD_EventSystem_GetGroup (FMOD_EVENTSYSTEM *eve
ntsystem, const char *name, FMOD_BOOL cacheevents, FMOD_EVENTGROUP **group)
; | | FMOD_RESULT F_API FMOD_EventSystem_GetGroup (FMOD_EVENTSYSTEM *eve
ntsystem, const char *name, FMOD_BOOL cacheevents, FMOD_EVENTGROUP **group)
; | |
| FMOD_RESULT F_API FMOD_EventSystem_GetEvent (FMOD_EVENTSYSTEM *eve
ntsystem, const char *name, FMOD_EVENT_MODE mode, FMOD_EVENT **event); | | FMOD_RESULT F_API FMOD_EventSystem_GetEvent (FMOD_EVENTSYSTEM *eve
ntsystem, const char *name, FMOD_EVENT_MODE mode, FMOD_EVENT **event); | |
|
| FMOD_RESULT F_API FMOD_EventSystem_GetEventBySystemID(FMOD_EVENTSYSTEM *eve
ntsystem, unsigned int systemid, FMOD_EVENT_MODE mode, FMOD_EVENT **event); | | | |
| FMOD_RESULT F_API FMOD_EventSystem_GetEventByGUID (FMOD_EVENTSYSTEM *eve
ntsystem, const FMOD_GUID *guid, FMOD_EVENT_MODE mode, FMOD_EVENT **event); | | FMOD_RESULT F_API FMOD_EventSystem_GetEventByGUID (FMOD_EVENTSYSTEM *eve
ntsystem, const FMOD_GUID *guid, FMOD_EVENT_MODE mode, FMOD_EVENT **event); | |
| FMOD_RESULT F_API FMOD_EventSystem_GetEventByGUIDString(FMOD_EVENTSYSTEM *e
ventsystem, const char *guid, FMOD_EVENT_MODE mode, FMOD_EVENT **event); | | FMOD_RESULT F_API FMOD_EventSystem_GetEventByGUIDString(FMOD_EVENTSYSTEM *e
ventsystem, const char *guid, FMOD_EVENT_MODE mode, FMOD_EVENT **event); | |
| FMOD_RESULT F_API FMOD_EventSystem_GetNumEvents (FMOD_EVENTSYSTEM *eve
ntsystem, int *numevents); | | FMOD_RESULT F_API FMOD_EventSystem_GetNumEvents (FMOD_EVENTSYSTEM *eve
ntsystem, int *numevents); | |
| | | | |
| /* | | /* | |
| Reverb interfaces. | | Reverb interfaces. | |
| */ | | */ | |
| | | | |
| FMOD_RESULT F_API FMOD_EventSystem_SetReverbProperties(FMOD_EVENTSYSTEM *ev
entsystem, const FMOD_REVERB_PROPERTIES *props); | | FMOD_RESULT F_API FMOD_EventSystem_SetReverbProperties(FMOD_EVENTSYSTEM *ev
entsystem, const FMOD_REVERB_PROPERTIES *props); | |
| FMOD_RESULT F_API FMOD_EventSystem_GetReverbProperties(FMOD_EVENTSYSTEM *ev
entsystem, FMOD_REVERB_PROPERTIES *props); | | FMOD_RESULT F_API FMOD_EventSystem_GetReverbProperties(FMOD_EVENTSYSTEM *ev
entsystem, FMOD_REVERB_PROPERTIES *props); | |
| | | | |
| skipping to change at line 901 | | skipping to change at line 898 | |
|---|
| /* | | /* | |
| '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, int *index, char **name); | | FMOD_RESULT F_API FMOD_EventProject_GetInfo (FMOD_EVENTPROJECT *ev
entproject, int *index, char **name); | |
| FMOD_RESULT F_API FMOD_EventProject_GetGroup (FMOD_EVENTPROJECT *ev
entproject, const char *name, FMOD_BOOL cacheevents, FMOD_EVENTGROUP **grou
p); | | FMOD_RESULT F_API FMOD_EventProject_GetGroup (FMOD_EVENTPROJECT *ev
entproject, const char *name, FMOD_BOOL cacheevents, FMOD_EVENTGROUP **grou
p); | |
| FMOD_RESULT F_API FMOD_EventProject_GetGroupByIndex (FMOD_EVENTPROJECT *ev
entproject, int index, FMOD_BOOL cacheevents, FMOD_EVENTGROUP **group); | | FMOD_RESULT F_API FMOD_EventProject_GetGroupByIndex (FMOD_EVENTPROJECT *ev
entproject, int index, FMOD_BOOL cacheevents, FMOD_EVENTGROUP **group); | |
| FMOD_RESULT F_API FMOD_EventProject_GetNumGroups (FMOD_EVENTPROJECT *ev
entproject, int *numgroups); | | FMOD_RESULT F_API FMOD_EventProject_GetNumGroups (FMOD_EVENTPROJECT *ev
entproject, int *numgroups); | |
| FMOD_RESULT F_API FMOD_EventProject_GetEvent (FMOD_EVENTPROJECT *ev
entproject, const char *name, FMOD_EVENT_MODE mode, FMOD_EVENT **event); | | FMOD_RESULT F_API FMOD_EventProject_GetEvent (FMOD_EVENTPROJECT *ev
entproject, const char *name, FMOD_EVENT_MODE mode, FMOD_EVENT **event); | |
|
| FMOD_RESULT F_API FMOD_EventProject_GetEventByProjectID(FMOD_EVENTPROJECT *
eventproject, unsigned int projectid, FMOD_EVENT_MODE mode, FMOD_EVENT **ev
ent); | | FMOD_RESULT F_API FMOD_EventProject_GetEventByIndex (FMOD_EVENTPROJECT *ev
entproject, int index, FMOD_EVENT_MODE mode, FMOD_EVENT **event); | |
| FMOD_RESULT F_API FMOD_EventProject_GetNumEvents (FMOD_EVENTPROJECT *ev
entproject, int *numevents); | | FMOD_RESULT F_API FMOD_EventProject_GetNumEvents (FMOD_EVENTPROJECT *ev
entproject, int *numevents); | |
| FMOD_RESULT F_API FMOD_EventProject_LoadSampleData (FMOD_EVENTPROJECT *ev
entproject, int *eventid_array, int sizeof_eventid_array, char **groupname_
array, int sizeof_groupname_array, FMOD_EVENT_MODE eventmode); | | FMOD_RESULT F_API FMOD_EventProject_LoadSampleData (FMOD_EVENTPROJECT *ev
entproject, int *eventid_array, int sizeof_eventid_array, char **groupname_
array, int sizeof_groupname_array, FMOD_EVENT_MODE eventmode); | |
| FMOD_RESULT F_API FMOD_EventProject_SetUserData (FMOD_EVENTPROJECT *ev
entproject, void *userdata); | | FMOD_RESULT F_API FMOD_EventProject_SetUserData (FMOD_EVENTPROJECT *ev
entproject, void *userdata); | |
| FMOD_RESULT F_API FMOD_EventProject_GetUserData (FMOD_EVENTPROJECT *ev
entproject, void **userdata); | | FMOD_RESULT F_API FMOD_EventProject_GetUserData (FMOD_EVENTPROJECT *ev
entproject, void **userdata); | |
| | | | |
| FMOD_RESULT F_API FMOD_EventProject_StopAllEvents (FMOD_EVENTPROJECT *ev
entproject, FMOD_BOOL immediate); | | FMOD_RESULT F_API FMOD_EventProject_StopAllEvents (FMOD_EVENTPROJECT *ev
entproject, FMOD_BOOL immediate); | |
| | | | |
| FMOD_RESULT F_API FMOD_EventProject_GetMemoryInfo (FMOD_EVENTPROJECT *ev
entproject, unsigned int memorybits, unsigned int event_memorybits, unsigne
d int *memoryused, FMOD_MEMORY_USAGE_DETAILS *memoryused_details); | | FMOD_RESULT F_API FMOD_EventProject_GetMemoryInfo (FMOD_EVENTPROJECT *ev
entproject, unsigned int memorybits, unsigned int event_memorybits, unsigne
d int *memoryused, FMOD_MEMORY_USAGE_DETAILS *memoryused_details); | |
| | | | |
| /* | | /* | |
| | | | |
| End of changes. 6 change blocks. |
|---|
| 13 lines changed or deleted | | 7 lines changed or added | |
|---|
|