From 533baf9ef310d727686ac8e4f65ae8803b3b8261 Mon Sep 17 00:00:00 2001 From: pjgat09 Date: Wed, 1 May 2013 21:28:15 +0000 Subject: [PATCH] N64: Added a function to get the audio rate from the core. --- .../Consoles/Nintendo/N64/N64.cs | 4 ++++ .../output/dll/mupen64plus-audio-bkm.dll | Bin 13824 -> 13824 bytes libmupen64plus/mupen64plus-audio-bkm/main.c | 5 +++++ 3 files changed, 9 insertions(+) diff --git a/BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs b/BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs index 46a79a7e11..8adf690f0f 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/N64/N64.cs @@ -214,6 +214,9 @@ namespace BizHawk.Emulation.Consoles.Nintendo.N64 [UnmanagedFunctionPointer(CallingConvention.Cdecl)] private delegate void ReadAudioBuffer(short[] dest); ReadAudioBuffer AudReadAudioBuffer; + [UnmanagedFunctionPointer(CallingConvention.Cdecl)] + private delegate int GetAudioRate(); + GetAudioRate AudGetAudioRate; // This has the same calling pattern for all the plugins [UnmanagedFunctionPointer(CallingConvention.Cdecl)] @@ -288,6 +291,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo.N64 AudPluginStartup = (PluginStartup)Marshal.GetDelegateForFunctionPointer(GetProcAddress(AudDll, "PluginStartup"), typeof(PluginStartup)); AudGetBufferSize = (GetBufferSize)Marshal.GetDelegateForFunctionPointer(GetProcAddress(AudDll, "GetBufferSize"), typeof(GetBufferSize)); AudReadAudioBuffer = (ReadAudioBuffer)Marshal.GetDelegateForFunctionPointer(GetProcAddress(AudDll, "ReadAudioBuffer"), typeof(ReadAudioBuffer)); + AudGetAudioRate = (GetAudioRate)Marshal.GetDelegateForFunctionPointer(GetProcAddress(AudDll, "GetAudioRate"), typeof(GetAudioRate)); RspPluginStartup = (PluginStartup)Marshal.GetDelegateForFunctionPointer(GetProcAddress(RspDll, "PluginStartup"), typeof(PluginStartup)); diff --git a/BizHawk.MultiClient/output/dll/mupen64plus-audio-bkm.dll b/BizHawk.MultiClient/output/dll/mupen64plus-audio-bkm.dll index da023ba69f3c80653ab311ee04854ac3dd5b9d3f..57bd43f4b7ad08255fe166883ef97919ececf9d8 100644 GIT binary patch delta 1005 zcmXw%e@t6d6vyv-NS);m;!5n|oj8iG@C96r zpW-&*1)S7}glUW=-EY1i2*|Fl%d(oQKgmNVo?GlgVhFXg`ixVV{nulIek2~4*dM<$ z+Ujd-G3L3NBjGoBIERYQtpkrA>#nwjkZI0uwCf+`JZr(f@lx9!XL8lXL`azM<|3FP z!eU}!m=D@$QH=$mpko6PjVxGAnX5Ke!ulURV;jT8{9wM*c@Om6yJHi1vEFn#9eh_p zV(KQ1S8_^Jib?0Bza>hx5k?*+&BR9n zq?ZhkAu>!x$$R7s(a8mpAW3qK+#m*7BFn@?vuPQ1(=F6Xo9Lr-FYTdybcB9L&(lBY zU)1R-^Q1gKd4Big$`x|8d{jOzzb>DU$K}uEZ{=IESJ|NilwRd!g)46;CzZ2GN|{$~ fDtDA6Wkty|H>_c9B^%up13Og06`Wl^Ml?K!~BHNC!%sN@gO$j4b-d&_c$3dP_kQoW z=bU?U273p4ch1(;$^-3iXZ#Gp(o(VzpaO-e|HL^rw-KK(vyMMV>WGPVlLR@*uaZX6 z%B{jyaxOD0oF$|#6E>a@gjsuL@m*$Pl0ipmB<_X`BGVoEJlw>@An-sFieH@w#+A`n@!{rueEMkw8jD$DK6Z|T^->g zR@t@O1Q0D*2BL1pRo+;?qz>2f{Gv5YoP4{js_HM)H*OrtmJRh63Wex<5{S`Job*Y4 z*w#d@^B--GksjV`&n^5qCPr7S#-j^-&c2Dhd8<$uZk@)f$wB;r&h=q^wGjZN#BCC< zAIiqvouRPqL9H_eVZDpLQoe*Ro-UWPGlpW;T&i17bWcN~dmi$w^S7}8y#zz0TBr4D zyq3$G%=jLZ3%OL`@zk}%_C+La(pPcOF-30jS;sQpL@`pd#0c4fqY3K{6&&}VIh%_< zfq$qUD<0=!<mHe{n2F~AA z^pL*H{gtN$o)yHAnlaO>cY}C{AFi<*uop78U0;{*tHK)K(8-S7wjrkfHhi9`a}a1YPZSh%$g92%sKu08BXemga{ZZNY6j(uMRQ z{YVPgi@c8z0w5yQNHgN+Chu}CdDmq6ygQ1|aeeAz3kLetUFtq{ zR6U@cRP(B?&Z!1wWu5XOK%b(|4A9N= zMY@e9>FabiP1A#PjDAK>(Q|Z?UZgX0md??6YLhEvx9pSelQp?RepcQh?~q6359QzF zYqG^}^N;(_`=|W3{MLXg@Nys-crCCqkPdtl_#$vQ;8i5$VI`()RT4@{;mW(pxH6&q er2L}j${$MEP30d2RxVg61Z#sI2aoVJ<>