| 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 0x00043104 | | #define FMOD_VERSION 0x00043105 | |
| | | | |
| /* | | /* | |
| 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 1014 | | skipping to change at line 1014 | |
| [SEE_ALSO] | | [SEE_ALSO] | |
| System::setCallback | | System::setCallback | |
| FMOD_SYSTEM_CALLBACK | | FMOD_SYSTEM_CALLBACK | |
| System::update | | System::update | |
| DSP::addInput | | DSP::addInput | |
| ] | | ] | |
| */ | | */ | |
| typedef enum | | typedef enum | |
| { | | { | |
| FMOD_SYSTEM_CALLBACKTYPE_DEVICELISTCHANGED, /* Called from Syst
em::update when the enumerated list of devices has changed. */ | | FMOD_SYSTEM_CALLBACKTYPE_DEVICELISTCHANGED, /* Called from Syst
em::update when the enumerated list of devices has changed. */ | |
|
| | | FMOD_SYSTEM_CALLBACKTYPE_DEVICELOST, /* Called from Syst
em::update when an output device has been lost due to control panel paramet
er changes and FMOD cannot automatically recover. */ | |
| FMOD_SYSTEM_CALLBACKTYPE_MEMORYALLOCATIONFAILED, /* Called directly
when a memory allocation fails somewhere in FMOD. */ | | FMOD_SYSTEM_CALLBACKTYPE_MEMORYALLOCATIONFAILED, /* Called directly
when a memory allocation fails somewhere in FMOD. */ | |
| FMOD_SYSTEM_CALLBACKTYPE_THREADCREATED, /* Called directly
when a thread is created. */ | | FMOD_SYSTEM_CALLBACKTYPE_THREADCREATED, /* Called directly
when a thread is created. */ | |
| FMOD_SYSTEM_CALLBACKTYPE_BADDSPCONNECTION, /* Called when a ba
d connection was made with DSP::addInput. Usually called from mixer thread
because that is where the connections are made. */ | | FMOD_SYSTEM_CALLBACKTYPE_BADDSPCONNECTION, /* Called when a ba
d connection was made with DSP::addInput. Usually called from mixer thread
because that is where the connections are made. */ | |
| FMOD_SYSTEM_CALLBACKTYPE_BADDSPLEVEL, /* Called when too
many effects were added exceeding the maximum tree depth of 128. This is m
ost likely caused by accidentally adding too many DSP effects. Usually call
ed from mixer thread because that is where the connections are made. */ | | FMOD_SYSTEM_CALLBACKTYPE_BADDSPLEVEL, /* Called when too
many effects were added exceeding the maximum tree depth of 128. This is m
ost likely caused by accidentally adding too many DSP effects. Usually call
ed from mixer thread because that is where the connections are made. */ | |
| | | | |
| FMOD_SYSTEM_CALLBACKTYPE_MAX, /* Maximum number o
f callback types supported. */ | | FMOD_SYSTEM_CALLBACKTYPE_MAX, /* Maximum number o
f callback types supported. */ | |
| FMOD_SYSTEM_CALLBACKTYPE_FORCEINT = 65536 /* Makes sure this
enum is signed 32bit. */ | | FMOD_SYSTEM_CALLBACKTYPE_FORCEINT = 65536 /* Makes sure this
enum is signed 32bit. */ | |
| } FMOD_SYSTEM_CALLBACKTYPE; | | } FMOD_SYSTEM_CALLBACKTYPE; | |
| | | | |
| /* | | /* | |
| | | | |
| skipping to change at line 2102 | | skipping to change at line 2103 | |
| FMOD_RESULT F_API FMOD_Sound_SetLoopPoints (FMOD_SOUND *sound, un
signed int loopstart, FMOD_TIMEUNIT loopstarttype, unsigned int loopend, FM
OD_TIMEUNIT loopendtype); | | FMOD_RESULT F_API FMOD_Sound_SetLoopPoints (FMOD_SOUND *sound, un
signed int loopstart, FMOD_TIMEUNIT loopstarttype, unsigned int loopend, FM
OD_TIMEUNIT loopendtype); | |
| FMOD_RESULT F_API FMOD_Sound_GetLoopPoints (FMOD_SOUND *sound, un
signed int *loopstart, FMOD_TIMEUNIT loopstarttype, unsigned int *loopend,
FMOD_TIMEUNIT loopendtype); | | FMOD_RESULT F_API FMOD_Sound_GetLoopPoints (FMOD_SOUND *sound, un
signed int *loopstart, FMOD_TIMEUNIT loopstarttype, unsigned int *loopend,
FMOD_TIMEUNIT loopendtype); | |
| | | | |
| /* | | /* | |
| For MOD/S3M/XM/IT/MID sequenced formats only. | | For MOD/S3M/XM/IT/MID sequenced formats only. | |
| */ | | */ | |
| | | | |
| FMOD_RESULT F_API FMOD_Sound_GetMusicNumChannels (FMOD_SOUND *sound, in
t *numchannels); | | FMOD_RESULT F_API FMOD_Sound_GetMusicNumChannels (FMOD_SOUND *sound, in
t *numchannels); | |
| FMOD_RESULT F_API FMOD_Sound_SetMusicChannelVolume (FMOD_SOUND *sound, in
t channel, float volume); | | FMOD_RESULT F_API FMOD_Sound_SetMusicChannelVolume (FMOD_SOUND *sound, in
t channel, float volume); | |
| FMOD_RESULT F_API FMOD_Sound_GetMusicChannelVolume (FMOD_SOUND *sound, in
t channel, float *volume); | | FMOD_RESULT F_API FMOD_Sound_GetMusicChannelVolume (FMOD_SOUND *sound, in
t channel, float *volume); | |
|
| | | FMOD_RESULT F_API FMOD_Sound_SetMusicSpeed (FMOD_SOUND *sound, fl | |
| | | oat speed); | |
| | | FMOD_RESULT F_API FMOD_Sound_GetMusicSpeed (FMOD_SOUND *sound, fl | |
| | | oat *speed); | |
| | | | |
| /* | | /* | |
| Userdata set/get. | | Userdata set/get. | |
| */ | | */ | |
| | | | |
| FMOD_RESULT F_API FMOD_Sound_SetUserData (FMOD_SOUND *sound, vo
id *userdata); | | FMOD_RESULT F_API FMOD_Sound_SetUserData (FMOD_SOUND *sound, vo
id *userdata); | |
| FMOD_RESULT F_API FMOD_Sound_GetUserData (FMOD_SOUND *sound, vo
id **userdata); | | FMOD_RESULT F_API FMOD_Sound_GetUserData (FMOD_SOUND *sound, vo
id **userdata); | |
| | | | |
| FMOD_RESULT F_API FMOD_Sound_GetMemoryInfo (FMOD_SOUND *sound, un
signed int memorybits, unsigned int event_memorybits, unsigned int *memoryu
sed, FMOD_MEMORY_USAGE_DETAILS *memoryused_details); | | FMOD_RESULT F_API FMOD_Sound_GetMemoryInfo (FMOD_SOUND *sound, un
signed int memorybits, unsigned int event_memorybits, unsigned int *memoryu
sed, FMOD_MEMORY_USAGE_DETAILS *memoryused_details); | |
| | | | |
| | | | |
End of changes. 3 change blocks. |
| 1 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 0x00043104 | | #define FMOD_EVENT_VERSION 0x00043105 | |
| | | | |
| /* | | /* | |
| 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 945 | | skipping to change at line 945 | |
| 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); | |
| 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_GetEventByProjectID(FMOD_EVENTPROJECT *
eventproject, unsigned int projectid, FMOD_EVENT_MODE mode, FMOD_EVENT **ev
ent); | |
| 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_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_CancelAllLoads (FMOD_EVENTPROJECT *ev
entproject); | |
| 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_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); | |
| | | | |
| /* | | /* | |
| 'EventGroup' API | | 'EventGroup' API | |
| */ | | */ | |
| | | | |
| FMOD_RESULT F_API FMOD_EventGroup_GetInfo (FMOD_EVENTGROUP *even
tgroup, int *index, char **name); | | FMOD_RESULT F_API FMOD_EventGroup_GetInfo (FMOD_EVENTGROUP *even
tgroup, int *index, char **name); | |
| | | | |
End of changes. 2 change blocks. |
| 1 lines changed or deleted | | 2 lines changed or added | |
|