From da292032199a9169896439b9171a0c5081fc5c4c Mon Sep 17 00:00:00 2001 From: withmorten Date: Sun, 17 Jan 2021 22:15:49 +0100 Subject: [PATCH] sync milessdk with re3mss --- vendor/milessdk/include/mss.h | 139 ++++++++++++++++++++-------------- vendor/milessdk/lib/mss32.lib | Bin 15316 -> 15570 bytes 2 files changed, 82 insertions(+), 57 deletions(-) diff --git a/vendor/milessdk/include/mss.h b/vendor/milessdk/include/mss.h index 38371eb9..b5b20bea 100644 --- a/vendor/milessdk/include/mss.h +++ b/vendor/milessdk/include/mss.h @@ -56,61 +56,86 @@ typedef struct _AILSOUNDINFO void const *initial_ptr; } AILSOUNDINFO; -#define DLLEXPORT extern "C" __declspec(dllexport) +typedef U32 (WINAPI *AIL_file_open_callback)(char const * Filename, U32 * FileHandle); -DLLEXPORT S32 WINAPI AIL_enumerate_3D_providers(HPROENUM *next, HPROVIDER *dest, C8 **name); -DLLEXPORT void WINAPI AIL_release_3D_sample_handle(H3DSAMPLE S); -DLLEXPORT void WINAPI AIL_close_3D_provider(HPROVIDER lib); -DLLEXPORT void WINAPI AIL_set_3D_provider_preference(HPROVIDER lib, C8 const *name, void const *val); -DLLEXPORT M3DRESULT WINAPI AIL_open_3D_provider(HPROVIDER lib); -DLLEXPORT C8 *WINAPI AIL_last_error(void); -DLLEXPORT S32 WINAPI AIL_3D_room_type(HPROVIDER lib); -DLLEXPORT void WINAPI AIL_set_3D_room_type(HPROVIDER lib, S32 room_type); -DLLEXPORT void WINAPI AIL_3D_provider_attribute(HPROVIDER lib, C8 const *name, void *val); -DLLEXPORT H3DSAMPLE WINAPI AIL_allocate_3D_sample_handle(HPROVIDER lib); -DLLEXPORT void WINAPI AIL_set_3D_sample_effects_level(H3DSAMPLE S, F32 effects_level); -DLLEXPORT void WINAPI AIL_set_3D_speaker_type(HPROVIDER lib, S32 speaker_type); -DLLEXPORT HSTREAM WINAPI AIL_open_stream(HDIGDRIVER dig, C8 const *filename, S32 stream_mem); -DLLEXPORT void WINAPI AIL_stream_ms_position(HSTREAM S, S32 *total_milliseconds, S32 *current_milliseconds); -DLLEXPORT void WINAPI AIL_close_stream(HSTREAM stream); -DLLEXPORT S32 WINAPI AIL_digital_handle_release(HDIGDRIVER drvr); -DLLEXPORT S32 WINAPI AIL_digital_handle_reacquire(HDIGDRIVER drvr); -DLLEXPORT C8 *WINAPI AIL_set_redist_directory(C8 const *dir); -DLLEXPORT S32 WINAPI AIL_startup(void); -DLLEXPORT S32 WINAPI AIL_set_preference(U32 number, S32 value); -DLLEXPORT HDIGDRIVER WINAPI AIL_open_digital_driver(U32 frequency, S32 bits, S32 channel, U32 flags); -DLLEXPORT void *WINAPI AIL_mem_alloc_lock(U32 size); -DLLEXPORT HSAMPLE WINAPI AIL_allocate_sample_handle(HDIGDRIVER dig); -DLLEXPORT void WINAPI AIL_init_sample(HSAMPLE S); -DLLEXPORT void WINAPI AIL_set_sample_type(HSAMPLE S, S32 format, U32 flags); -DLLEXPORT void WINAPI AIL_pause_stream(HSTREAM stream, S32 onoff); -DLLEXPORT void WINAPI AIL_release_sample_handle(HSAMPLE S); -DLLEXPORT void WINAPI AIL_mem_free_lock(void *ptr); -DLLEXPORT void WINAPI AIL_close_digital_driver(HDIGDRIVER dig); -DLLEXPORT void WINAPI AIL_shutdown(void); -DLLEXPORT void WINAPI AIL_set_3D_sample_volume(H3DSAMPLE S, S32 volume); -DLLEXPORT void WINAPI AIL_set_sample_volume(HSAMPLE S, S32 volume); -DLLEXPORT void WINAPI AIL_set_sample_address(HSAMPLE S, void const *start, U32 len); -DLLEXPORT S32 WINAPI AIL_set_3D_sample_info(H3DSAMPLE S, AILSOUNDINFO const *info); -DLLEXPORT void WINAPI AIL_set_3D_position(H3DPOBJECT obj, F32 X, F32 Y, F32 Z); -DLLEXPORT void WINAPI AIL_set_3D_sample_distances(H3DSAMPLE S, F32 max_dist, F32 min_dist); -DLLEXPORT void WINAPI AIL_set_sample_pan(HSAMPLE S, S32 pan); -DLLEXPORT void WINAPI AIL_set_sample_playback_rate(HSAMPLE S, S32 playback_rate); -DLLEXPORT void WINAPI AIL_set_3D_sample_playback_rate(H3DSAMPLE S, S32 playback_rate); -DLLEXPORT void WINAPI AIL_set_sample_loop_block(HSAMPLE S, S32 loop_start_offset, S32 loop_end_offset); -DLLEXPORT void WINAPI AIL_set_3D_sample_loop_block(H3DSAMPLE S, S32 loop_start_offset, S32 loop_end_offset); -DLLEXPORT void WINAPI AIL_set_sample_loop_count(HSAMPLE S, S32 loop_count); -DLLEXPORT void WINAPI AIL_set_3D_sample_loop_count(H3DSAMPLE S, S32 loops); -DLLEXPORT U32 WINAPI AIL_sample_status(HSAMPLE S); -DLLEXPORT U32 WINAPI AIL_3D_sample_status(H3DSAMPLE S); -DLLEXPORT void WINAPI AIL_start_sample(HSAMPLE S); -DLLEXPORT void WINAPI AIL_start_3D_sample(H3DSAMPLE S); -DLLEXPORT void WINAPI AIL_end_sample(HSAMPLE S); -DLLEXPORT void WINAPI AIL_end_3D_sample(H3DSAMPLE S); -DLLEXPORT void WINAPI AIL_set_stream_loop_count(HSTREAM stream, S32 count); -DLLEXPORT S32 WINAPI AIL_service_stream(HSTREAM stream, S32 fillup); -DLLEXPORT void WINAPI AIL_start_stream(HSTREAM stream); -DLLEXPORT void WINAPI AIL_set_stream_ms_position(HSTREAM S, S32 milliseconds); -DLLEXPORT void WINAPI AIL_set_stream_volume(HSTREAM stream, S32 volume); -DLLEXPORT void WINAPI AIL_set_stream_pan(HSTREAM stream, S32 pan); -DLLEXPORT S32 WINAPI AIL_stream_status(HSTREAM stream); +typedef void (WINAPI *AIL_file_close_callback)(U32 FileHandle); + +#define AIL_FILE_SEEK_BEGIN 0 +#define AIL_FILE_SEEK_CURRENT 1 +#define AIL_FILE_SEEK_END 2 + +typedef S32(WINAPI *AIL_file_seek_callback)(U32 FileHandle, S32 Offset, U32 Type); + +typedef U32(WINAPI *AIL_file_read_callback)(U32 FileHandle, void* Buffer, U32 Bytes); + +#ifdef RE3MSS_EXPORTS +#define RE3MSS_EXPORT __declspec(dllexport) +#else +#define RE3MSS_EXPORT __declspec(dllimport) +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +RE3MSS_EXPORT S32 WINAPI AIL_enumerate_3D_providers(HPROENUM *next, HPROVIDER *dest, C8 **name); +RE3MSS_EXPORT void WINAPI AIL_release_3D_sample_handle(H3DSAMPLE S); +RE3MSS_EXPORT void WINAPI AIL_close_3D_provider(HPROVIDER lib); +RE3MSS_EXPORT void WINAPI AIL_set_3D_provider_preference(HPROVIDER lib, C8 const *name, void const *val); +RE3MSS_EXPORT M3DRESULT WINAPI AIL_open_3D_provider(HPROVIDER lib); +RE3MSS_EXPORT C8 *WINAPI AIL_last_error(void); +RE3MSS_EXPORT S32 WINAPI AIL_3D_room_type(HPROVIDER lib); +RE3MSS_EXPORT void WINAPI AIL_set_3D_room_type(HPROVIDER lib, S32 room_type); +RE3MSS_EXPORT void WINAPI AIL_3D_provider_attribute(HPROVIDER lib, C8 const *name, void *val); +RE3MSS_EXPORT H3DSAMPLE WINAPI AIL_allocate_3D_sample_handle(HPROVIDER lib); +RE3MSS_EXPORT void WINAPI AIL_set_3D_sample_effects_level(H3DSAMPLE S, F32 effects_level); +RE3MSS_EXPORT void WINAPI AIL_set_3D_speaker_type(HPROVIDER lib, S32 speaker_type); +RE3MSS_EXPORT HSTREAM WINAPI AIL_open_stream(HDIGDRIVER dig, C8 const *filename, S32 stream_mem); +RE3MSS_EXPORT void WINAPI AIL_stream_ms_position(HSTREAM S, S32 *total_milliseconds, S32 *current_milliseconds); +RE3MSS_EXPORT void WINAPI AIL_close_stream(HSTREAM stream); +RE3MSS_EXPORT S32 WINAPI AIL_digital_handle_release(HDIGDRIVER drvr); +RE3MSS_EXPORT S32 WINAPI AIL_digital_handle_reacquire(HDIGDRIVER drvr); +RE3MSS_EXPORT C8 *WINAPI AIL_set_redist_directory(C8 const *dir); +RE3MSS_EXPORT S32 WINAPI AIL_startup(void); +RE3MSS_EXPORT S32 WINAPI AIL_set_preference(U32 number, S32 value); +RE3MSS_EXPORT HDIGDRIVER WINAPI AIL_open_digital_driver(U32 frequency, S32 bits, S32 channel, U32 flags); +RE3MSS_EXPORT void *WINAPI AIL_mem_alloc_lock(U32 size); +RE3MSS_EXPORT HSAMPLE WINAPI AIL_allocate_sample_handle(HDIGDRIVER dig); +RE3MSS_EXPORT void WINAPI AIL_init_sample(HSAMPLE S); +RE3MSS_EXPORT void WINAPI AIL_set_sample_type(HSAMPLE S, S32 format, U32 flags); +RE3MSS_EXPORT void WINAPI AIL_pause_stream(HSTREAM stream, S32 onoff); +RE3MSS_EXPORT void WINAPI AIL_release_sample_handle(HSAMPLE S); +RE3MSS_EXPORT void WINAPI AIL_mem_free_lock(void *ptr); +RE3MSS_EXPORT void WINAPI AIL_close_digital_driver(HDIGDRIVER dig); +RE3MSS_EXPORT void WINAPI AIL_shutdown(void); +RE3MSS_EXPORT void WINAPI AIL_set_3D_sample_volume(H3DSAMPLE S, S32 volume); +RE3MSS_EXPORT void WINAPI AIL_set_sample_volume(HSAMPLE S, S32 volume); +RE3MSS_EXPORT void WINAPI AIL_set_sample_address(HSAMPLE S, void const *start, U32 len); +RE3MSS_EXPORT S32 WINAPI AIL_set_3D_sample_info(H3DSAMPLE S, AILSOUNDINFO const *info); +RE3MSS_EXPORT void WINAPI AIL_set_3D_position(H3DPOBJECT obj, F32 X, F32 Y, F32 Z); +RE3MSS_EXPORT void WINAPI AIL_set_3D_sample_distances(H3DSAMPLE S, F32 max_dist, F32 min_dist); +RE3MSS_EXPORT void WINAPI AIL_set_sample_pan(HSAMPLE S, S32 pan); +RE3MSS_EXPORT void WINAPI AIL_set_sample_playback_rate(HSAMPLE S, S32 playback_rate); +RE3MSS_EXPORT void WINAPI AIL_set_3D_sample_playback_rate(H3DSAMPLE S, S32 playback_rate); +RE3MSS_EXPORT void WINAPI AIL_set_sample_loop_block(HSAMPLE S, S32 loop_start_offset, S32 loop_end_offset); +RE3MSS_EXPORT void WINAPI AIL_set_3D_sample_loop_block(H3DSAMPLE S, S32 loop_start_offset, S32 loop_end_offset); +RE3MSS_EXPORT void WINAPI AIL_set_sample_loop_count(HSAMPLE S, S32 loop_count); +RE3MSS_EXPORT void WINAPI AIL_set_3D_sample_loop_count(H3DSAMPLE S, S32 loops); +RE3MSS_EXPORT U32 WINAPI AIL_sample_status(HSAMPLE S); +RE3MSS_EXPORT U32 WINAPI AIL_3D_sample_status(H3DSAMPLE S); +RE3MSS_EXPORT void WINAPI AIL_start_sample(HSAMPLE S); +RE3MSS_EXPORT void WINAPI AIL_start_3D_sample(H3DSAMPLE S); +RE3MSS_EXPORT void WINAPI AIL_end_sample(HSAMPLE S); +RE3MSS_EXPORT void WINAPI AIL_end_3D_sample(H3DSAMPLE S); +RE3MSS_EXPORT void WINAPI AIL_set_stream_loop_count(HSTREAM stream, S32 count); +RE3MSS_EXPORT S32 WINAPI AIL_service_stream(HSTREAM stream, S32 fillup); +RE3MSS_EXPORT void WINAPI AIL_start_stream(HSTREAM stream); +RE3MSS_EXPORT void WINAPI AIL_set_stream_ms_position(HSTREAM S, S32 milliseconds); +RE3MSS_EXPORT void WINAPI AIL_set_stream_volume(HSTREAM stream, S32 volume); +RE3MSS_EXPORT void WINAPI AIL_set_stream_pan(HSTREAM stream, S32 pan); +RE3MSS_EXPORT S32 WINAPI AIL_stream_status(HSTREAM stream); +RE3MSS_EXPORT void WINAPI AIL_set_file_callbacks(AIL_file_open_callback opencb, AIL_file_close_callback closecb, AIL_file_seek_callback seekcb, AIL_file_read_callback readcb); + +#ifdef __cplusplus +} +#endif diff --git a/vendor/milessdk/lib/mss32.lib b/vendor/milessdk/lib/mss32.lib index f97091c75ff9988cd906e5e43e56b538c951a428..e63a1a05f4daa88f97baf81655ef07cc9a7b8124 100644 GIT binary patch delta 3203 zcmchZe{56N6~_mMP~=*S9Ps;*^OA%%c;?q_F-tvek{$p5X>6Va1IRSyt3Hxjw} zh#J~unpYDE(i1Wn*a*_=WtuERg78t9#w$bu{|=b|Tnn;^9DDHuo-^Iz7Z$;pAl4(3 z>?ab$B$;Fi|AW|+OzI_~8GLwx$S#?B*a)H!79@sb8n+@K5XZ&@nGqRp_aKoM1fw#c z(?o*0D>98HEChiGnVJ(sf?7Bh)RoFKj3HB?2_k~TJu<%CL;}BE#s?ii(-$%i*KLCX z5WgT3g+oEjG8y+2ksu;=2|SO<)V3l35bTwy--n$8?_!w{j!qEh6!0!<1D~w6@rnX% za_tjs4|jB~ZCkUdvvc*THNSj(VJt;$Z5``2w6*>4?t9xFzm>tEpBKDh%&(pJ|7)k2 zh#sgS+UO+ea}l*S5Us}GL>l86qV;%Mnuv~uiLNvf?eJqk06EGM?FDB%u)|zWjHo|J zB;lFDa|+LwaG*Z0D}u3ltVRBYP)Xfe;b>!=XaoX-UgRxEbUFlqIwBM1CLnO42FA5S zr5GDSP+JkiJy^UOxwIpQD4t(nY#Zh;z*i}pFT`d;|n2l2(wX@^E< zfV#zXp#-JKL=EJlEIFy3LKG$=6;m^LsgeBTqBJ%dB@Z=`o92_ADkwuqDyKL($U>!L zr7DV%M72~$3#g3DWG5TdP$e0th_p19s%ajTkdA^BAq~x;f*IAW?^m{vM~%)yj`@2E z=g%siLj#t>TKlZwTvhQwi;b<0dHkNF0A*(E|K=-dVxP>c8f#bvjL&7k_{I#9{7mRdcJe{pPxeyk<$BeXGkP zJ!jZ=l^=2S-86OR7q01Ax1qkH9WuAM7b%wT%9@}QKC|p&9&|5Mjz_aW>BZRb_c`uK zDaSX2Y&;$|OMP>XOmeR$tDIX|W8?i%v+>hf=`)lY72?qOpwY$mhV*J*T+EpH|H6EV1(S zfJMrT-#^Vm{)A!*S+#Llz$|?*{op$s3MiGuvh4wjVM}r1!%B!3Lwsqeg^k(#9NiT7 zYV5{GY^hZVh`73N42566`xox1RmR0PV_tvY<*Ph7drll*Xa9-+@XDa-_;TqrtT=t- z7`g^-uEZt!O1=_Qr9@=fdUEwUd{>=1(-^PQ4vz9$dE>sIvErEaV>B3CepJNLawjT6 z<#R(QDA_mPd5L$2W>teo|J&|2C)gUEwN0eJurVI|#0lSag!^N&jo%38xt=LlW6RR< z%jkLNO9)}K+|Jf|m7O@UKSj*O;#dE135^^WZsA74BSwks=+RPwBZoY*L!{#37OV^L6fztL`VpeYQPc9>MDctzV+= zeiQRhV1d$OuG9_B7CJ|qSnWjs18BInIA_GEJ8L`jcM+$LUunoF{U8F(@A`%>d3j61 z#(fS0hZCyope5-3^?Y(zw1fbUrp#>kWlRt6{}h0`0bdVA5Gd|7*I;( zLe?xFUOw#Pvq?K2&}w*lGQUD}Yg@LCi3+Kkk&7-caZyTTl&dz4YkJ9;n~$e#++9}0 zn`RrKXX=jq?DLQCI;SwaHLBwY8uq^#Ix0R&>XE)ZWmR06%-_6bV&|)02RN3t@!uM6 zxu5-yEdRHYUx&f&0xjR4o)s#hFnsv*qEjLYyz+Untb#v}DTQX5TH2!9d$|2b1+3y+ zo(U^sZOH_U1NU7X#zz*uIz+pWY`o5|^ucIBhSy&B<0wAJ@TDMe)LMrAsfq?By3$P- zW=xX2CL2>|h#3Bmwdmfm_fMC@MT$qWsu)lz#$U8uyC90SQN*yN(!oD%QpF%n2CYf= PEI&0|4ZAcSZ1VgMN$ln9 delta 2953 zcmchZOK6-`7>3`b(=?gpGELH%m}D|DnankFzh@F+Eww6S5jV98CMl$aB5l*O+6W~< zs4j{~^xG7x@w&*O)l0+?aUS{ zEWb(Btx1jniqb<(qzSN?=SYT2HC8y1Amb}`r72YSO|o;E;#t5V z%8{g9n&brvAekmj{u-btoz`U6=}#&*G@%@zSd3APBC%I9bOcb8IyBKqKry&S6QdYK z{EQ~I1}Lgbq{xqJ!t9L25=RnZ4n_5WW{AxuQ^*};0Fq`vMew?2fE6oJ%bJ1v{3cOW zpon*CQhu(J!ONNciU9MZGz_eeeL?yrxRwDf7JyS6D;(#tz}X_@5?30yK>sGLUCRTf zOIXA@4Q?<&F2q1FU@wClVOKhsWHJiu8Dt>NpNRu&+^y3TF-~W97+4}J^n1WL)yacg zKf@%~DQ0c}SWW@=Io@ELZuk zKgx(8jR8~6g6jVyZ5iS5_{FEWTCj$U-310J{$L?4{kiY;hFKU&d-Cd80} z1DnwBZ_dU4Dd}cRJ@L%=RDSo=?A*~;4$T~xo7#Wk#M~j7Xl-46Y5Td&a?aVdn%?n2 zZ+o@x{JGk3ii*Hj}c#61x4!PazlhII*-DEmc3;R}R z)SUOoZ=p`horjf&!66?tc_kb+-0N!R!-m?6rFe_V%(Kh$LC*CyDB_oG@e?;US~Ll!#x@^iG;X7*037C99& z6dRG>iy4vcBy}JCjM~nq0jEd8aifsB;Q6>AxV~-o;#HdpnGRX~)rGt;G-h9`H}%^g zLt=e?EMd&E**ebo#4aOFMa$-c!HeyX_U3+Wzf&GXw%g6>(wCElbXKjywxx{udPxf@ zqa@Y;pi|kcwEpC*xV;o=}AqK%G`U1N6$mmL^%xZV15g>XHIhrWbQV_BxGi zy^=GwRjv8*`h4>3=S%C5U%L9_`Mgn){jd$v@D;gv5onlYiJ zSS1WgYjN1Fmbb6|K13L!wb3V^7L8P{O5Az_BeGcRtF^@`hbzVjvP+Jssv14=X32=d z7F%)Rab=?I@JesVXe_I>Bt+%$3ZrjsleLPW(OyQHWqjA*k?~=}gd(gMK}ipLWWn1kUk@8e zX8S$z*Rbw+55;7~Q%%~Hs=Yf<)du{jf}FfoE!quu%dJxSxtLd_T=90vxvEo^!$z}c zXZ1tb6=eTN)*eL3SRK(>9-~1~ZjEe^VLyx|)_c?4C(n(VJ|7MK4e49V AmjD0&