| 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 0x00043105 | | #define FMOD_VERSION 0x00043200 | |
| | | | |
| /* | | /* | |
| 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 435 | | skipping to change at line 435 | |
| | | | |
| [PLATFORMS] | | [PLATFORMS] | |
| Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation 2, PlaySt
ation Portable, PlayStation 3, Wii, iPhone | | Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation 2, PlaySt
ation Portable, PlayStation 3, Wii, iPhone | |
| | | | |
| [SEE_ALSO] | | [SEE_ALSO] | |
| Debug_SetLevel | | Debug_SetLevel | |
| Debug_GetLevel | | Debug_GetLevel | |
| ] | | ] | |
| */ | | */ | |
| #define FMOD_DEBUG_LEVEL_NONE 0x00000000 | | #define FMOD_DEBUG_LEVEL_NONE 0x00000000 | |
|
| #define FMOD_DEBUG_LEVEL_LOG 0x00000001 | | #define FMOD_DEBUG_LEVEL_LOG 0x00000001 /* Will display gen | |
| #define FMOD_DEBUG_LEVEL_ERROR 0x00000002 | | eric logging messages. */ | |
| #define FMOD_DEBUG_LEVEL_WARNING 0x00000004 | | #define FMOD_DEBUG_LEVEL_ERROR 0x00000002 /* Will display err | |
| #define FMOD_DEBUG_LEVEL_HINT 0x00000008 | | ors. */ | |
| | | #define FMOD_DEBUG_LEVEL_WARNING 0x00000004 /* Will display war | |
| | | nings that are not fatal. */ | |
| | | #define FMOD_DEBUG_LEVEL_HINT 0x00000008 /* Will hint to you | |
| | | if there is something possibly better you could be doing. */ | |
| #define FMOD_DEBUG_LEVEL_ALL 0x000000FF | | #define FMOD_DEBUG_LEVEL_ALL 0x000000FF | |
|
| #define FMOD_DEBUG_TYPE_MEMORY 0x00000100 | | #define FMOD_DEBUG_TYPE_MEMORY 0x00000100 /* Show FMOD memory | |
| #define FMOD_DEBUG_TYPE_THREAD 0x00000200 | | related logging messages. */ | |
| #define FMOD_DEBUG_TYPE_FILE 0x00000400 | | #define FMOD_DEBUG_TYPE_THREAD 0x00000200 /* Show FMOD thread | |
| #define FMOD_DEBUG_TYPE_NET 0x00000800 | | related logging messages. */ | |
| #define FMOD_DEBUG_TYPE_EVENT 0x00001000 | | #define FMOD_DEBUG_TYPE_FILE 0x00000400 /* Show FMOD file s | |
| | | ystem related logging messages. */ | |
| | | #define FMOD_DEBUG_TYPE_NET 0x00000800 /* Show FMOD networ | |
| | | k related logging messages. */ | |
| | | #define FMOD_DEBUG_TYPE_EVENT 0x00001000 /* Show FMOD Event | |
| | | related logging messages. */ | |
| #define FMOD_DEBUG_TYPE_ALL 0x0000FFFF | | #define FMOD_DEBUG_TYPE_ALL 0x0000FFFF | |
|
| #define FMOD_DEBUG_DISPLAY_TIMESTAMPS 0x01000000 | | #define FMOD_DEBUG_DISPLAY_TIMESTAMPS 0x01000000 /* Display the time | |
| #define FMOD_DEBUG_DISPLAY_LINENUMBERS 0x02000000 | | stamp of the log entry in milliseconds. */ | |
| #define FMOD_DEBUG_DISPLAY_COMPRESS 0x04000000 | | #define FMOD_DEBUG_DISPLAY_LINENUMBERS 0x02000000 /* Display the FMOD | |
| #define FMOD_DEBUG_DISPLAY_THREAD 0x08000000 | | Ex source code line numbers, for debugging purposes. */ | |
| | | #define FMOD_DEBUG_DISPLAY_COMPRESS 0x04000000 /* If a message is | |
| | | repeated more than 5 times it will stop displaying it and instead display t | |
| | | he number of times the message was logged. */ | |
| | | #define FMOD_DEBUG_DISPLAY_THREAD 0x08000000 /* Display the thre | |
| | | ad ID of the calling function that caused this log entry to appear. */ | |
| #define FMOD_DEBUG_DISPLAY_ALL 0x0F000000 | | #define FMOD_DEBUG_DISPLAY_ALL 0x0F000000 | |
| #define FMOD_DEBUG_ALL 0xFFFFFFFF | | #define FMOD_DEBUG_ALL 0xFFFFFFFF | |
| /* [DEFINE_END] */ | | /* [DEFINE_END] */ | |
| | | | |
| /* | | /* | |
| [DEFINE] | | [DEFINE] | |
| [ | | [ | |
| [NAME] | | [NAME] | |
| FMOD_MEMORY_TYPE | | FMOD_MEMORY_TYPE | |
| | | | |
| | | | |
End of changes. 4 change blocks. |
| 14 lines changed or deleted | | 28 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 0x00043105 | | #define FMOD_EVENT_VERSION 0x00043200 | |
| | | | |
| /* | | /* | |
| 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 495 | | skipping to change at line 494 | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| FMOD_EVENT_SYSTEMINFO() : numevents(0), numinstances(0), maxwavebanks(0
), wavebankinfo(0), numplayingevents(0), playingevents(0) {} | | FMOD_EVENT_SYSTEMINFO() : numevents(0), numinstances(0), maxwavebanks(0
), wavebankinfo(0), numplayingevents(0), playingevents(0) {} | |
| #endif | | #endif | |
| | | | |
| int numevents; /* [out] Total number of eve
nts in all event groups in this event system. */ | | int numevents; /* [out] Total number of eve
nts in all event groups in this event system. */ | |
| int numinstances; /* [out] Total number of eve
nt instances in all event groups in this event system. */ | | int numinstances; /* [out] Total number of eve
nt instances in all event groups in this event system. */ | |
| int maxwavebanks; /* [in/out] Out, number of w
avebanks loaded by the EventSystem. In. Maximum size of array of wavebanki
nfo structures supplied by user. Optional. */ | | int maxwavebanks; /* [in/out] Out, number of w
avebanks loaded by the EventSystem. In. Maximum size of array of wavebanki
nfo structures supplied by user. Optional. */ | |
| FMOD_EVENT_WAVEBANKINFO *wavebankinfo; /* [in] Pointer to array FMO
D_EVENT_WAVEBANKINFO structures (max size defined by maxwavebanks). FMOD w
ill fill these in with detailed information on each wave bank. Optional. */ | | FMOD_EVENT_WAVEBANKINFO *wavebankinfo; /* [in] Pointer to array FMO
D_EVENT_WAVEBANKINFO structures (max size defined by maxwavebanks). FMOD w
ill fill these in with detailed information on each wave bank. Optional. */ | |
| int numplayingevents; /* [in/out] On entry, maximu
m number of entries in playingevents array. On exit, actual number of entri
es in playingevents array, or if playingevents is null, then it is just the
number of currently playing events. Optional. */ | | int numplayingevents; /* [in/out] On entry, maximu
m number of entries in playingevents array. On exit, actual number of entri
es in playingevents array, or if playingevents is null, then it is just the
number of currently playing events. Optional. */ | |
| FMOD_EVENT **playingevents; /* [in/out] Pointer to an ar
ray that will be filled with the event handles of all playing events. Optio
nal. Specify 0 if not needed. Must be used in conjunction with numplayingev
ents. */ | | FMOD_EVENT **playingevents; /* [in/out] Pointer to an ar
ray that will be filled with the event handles of all playing events. Optio
nal. Specify 0 if not needed. Must be used in conjunction with numplayingev
ents. */ | |
|
| | | int numloadsqueued; /* [out] Current number of s
ound banks queued for loading due to using FMOD_EVENT_NONBLOCKING flag. */ | |
| } FMOD_EVENT_SYSTEMINFO; | | } FMOD_EVENT_SYSTEMINFO; | |
| | | | |
| /* | | /* | |
| [STRUCTURE] | | [STRUCTURE] | |
| [ | | [ | |
| [DESCRIPTION] | | [DESCRIPTION] | |
| Structure containing realtime information about an event project. | | Structure containing realtime information about an event project. | |
| | | | |
| [REMARKS] | | [REMARKS] | |
| On entry, numplayingevents should be set to the number of elements in t
he playingevents array. If the actual | | On entry, numplayingevents should be set to the number of elements in t
he playingevents array. If the actual | |
| | | | |
End of changes. 2 change blocks. |
| 2 lines changed or deleted | | 2 lines changed or added | |
|