R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move Miles and Bink hooks/implementations to shared 'codecs' folder

Browse Source
This commit is contained in:
Kawe Mazidjatari 2022-11-27 17:27:35 +01:00
parent 2636a5faa5
commit 03dc4eada5
13 changed files with 123 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
r5dev/codecs/Miles/miles_impl.cpp Normal file
View File

@ -0,0 +1,39 @@
#include "core/stdafx.h"
#include "miles_impl.h"
//-----------------------------------------------------------------------------
// Purpose: logs debug output emitted from the Miles Sound System
// Input : nLogLevel -
// pszMessage -
//-----------------------------------------------------------------------------
void AIL_LogFunc(int64_t nLogLevel, const char* pszMessage)
{
DevMsg(eDLL_T::AUDIO, pszMessage);
v_AIL_LogFunc(nLogLevel, pszMessage);
}
//-----------------------------------------------------------------------------
// Purpose: initializes the miles sound system
// Output : true on success, false otherwise
//-----------------------------------------------------------------------------
bool Miles_Initialize()
{
bool result = v_Miles_Initialize();
DevMsg(eDLL_T::AUDIO, "Miles_Initialize: %s\n", result ? "initialized successfully" : "failed to initialize");
return result;
}
///////////////////////////////////////////////////////////////////////////////
void MilesCore_Attach()
{
DetourAttach(&v_AIL_LogFunc, &AIL_LogFunc);
DetourAttach(&v_Miles_Initialize, &Miles_Initialize);
}
void MilesCore_Detach()
{
DetourDetach(&v_AIL_LogFunc, &AIL_LogFunc);
DetourDetach(&v_Miles_Initialize, &Miles_Initialize);
}

1
r5dev/milessdk/shared/core.h → r5dev/codecs/Miles/miles_impl.h
View File

@ -16,6 +16,7 @@ class MilesCore : public IDetour
virtual void GetAdr(void) const
{
spdlog::debug("| FUN: AIL_LogFunc : {:#18x} |\n", p_AIL_LogFunc.GetPtr());
spdlog::debug("| FUN: Miles_Initialize : {:#18x} |\n", p_Miles_Initialize.GetPtr());
spdlog::debug("+----------------------------------------------------------------+\n");
}
virtual void GetFun(void) const

4
r5dev/milessdk/win64_rrthreads.h → r5dev/codecs/Miles/radshal_wasapi.h
View File

@ -4,7 +4,7 @@
inline CMemory p_WASAPI_GetAudioDevice;
///////////////////////////////////////////////////////////////////////////////
class VWASAPIServiceThread : public IDetour
class VRadShal : public IDetour
{
virtual void GetAdr(void) const
{
@ -23,4 +23,4 @@ class VWASAPIServiceThread : public IDetour
};
///////////////////////////////////////////////////////////////////////////////
REGISTER(VWASAPIServiceThread);
REGISTER(VRadShal);

31
r5dev/codecs/bink/bink_impl.cpp Normal file
View File

@ -0,0 +1,31 @@
#include "core/stdafx.h"
#include "codecs/bink/bink_impl.h"
//-----------------------------------------------------------------------------
// Purpose: opens bik video by handle, and logs any error caused during loading
// Input : hBinkFile -
// nFlags -
// Output : pointer to bik video structure, null if failed
//-----------------------------------------------------------------------------
void* BinkOpen(HANDLE hBinkFile, UINT32 nFlags)
{
void* pHandle = v_BinkOpen(hBinkFile, nFlags);
if (!pHandle)
{
// Retrieve BinkOpen error using the DLL's exported function "BinkGetError()".
Error(eDLL_T::VIDEO, NO_ERROR, "%s: %s\n", __FUNCTION__, v_BinkGetError());
}
return pHandle;
}
///////////////////////////////////////////////////////////////////////////////
void BinkImpl_Attach()
{
DetourAttach(&v_BinkOpen, &BinkOpen);
}
void BinkImpl_Detach()
{
DetourDetach(&v_BinkOpen, &BinkOpen);
}

0
r5dev/codecs/bink_impl.h → r5dev/codecs/bink/bink_impl.h
View File

24
r5dev/codecs/bink_impl.cpp
View File

@ -1,24 +0,0 @@
#include "core/stdafx.h"
#include "codecs/bink_impl.h"
void* BinkOpen(HANDLE hBinkFile, UINT32 nFlags)
{
void* pHandle = v_BinkOpen(hBinkFile, nFlags);
if (!pHandle)
{
// Retrieve BinkOpen error using the DLL's exported function "BinkGetError()".
Error(eDLL_T::VIDEO, NO_ERROR, "%s: %s\n", __FUNCTION__, v_BinkGetError());
}
return pHandle;
}
void BinkImpl_Attach()
{
DetourAttach(&v_BinkOpen, &BinkOpen);
}
void BinkImpl_Detach()
{
DetourDetach(&v_BinkOpen, &BinkOpen);
}

2
r5dev/common/opcodes.cpp
View File

@ -31,7 +31,7 @@
#include "bsplib/bsplib.h"
#include "ebisusdk/EbisuSDK.h"
#ifndef DEDICATED
#include "milessdk/win64_rrthreads.h"
#include "codecs/miles/radshal_wasapi.h"
#endif // !DEDICATED
#ifdef DEDICATED

10
r5dev/core/init.cpp
View File

@ -34,9 +34,9 @@
#include "datacache/mdlcache.h"
#include "ebisusdk/EbisuSDK.h"
#ifndef DEDICATED
#include "milessdk/shared/core.h"
#include "milessdk/win64_rrthreads.h"
#include "codecs/bink_impl.h"
#include "codecs/bink/bink_impl.h"
#include "codecs/miles/miles_impl.h"
#include "codecs/miles/radshal_wasapi.h"
#endif // !DEDICATED
#include "vphysics/QHull.h"
#include "bsplib/bsplib.h"
@ -167,8 +167,8 @@ void Systems_Init()
MDLCache_Attach();
#ifndef DEDICATED
MilesCore_Attach();
BinkImpl_Attach();
MilesCore_Attach();
CMaterialSystem_Attach();
#endif // !DEDICATED
@ -305,8 +305,8 @@ void Systems_Shutdown()
MDLCache_Detach();
#ifndef DEDICATED
MilesCore_Detach();
BinkImpl_Detach();
MilesCore_Detach();
CMaterialSystem_Detach();
#endif // !DEDICATED

29
r5dev/milessdk/shared/core.cpp
View File

@ -1,29 +0,0 @@
#include "core/stdafx.h"
#include "milessdk/shared/core.h"
void AIL_LogFunc(int64_t nLogLevel, const char* pszMessage)
{
DevMsg(eDLL_T::AUDIO, pszMessage);
v_AIL_LogFunc(nLogLevel, pszMessage);
}
bool Miles_Initialize()
{
bool result = v_Miles_Initialize();
DevMsg(eDLL_T::AUDIO, "Miles_Initialize: %s\n", result ? "initialized successfully" : "failed to initialize");
return result;
}
void MilesCore_Attach()
{
DetourAttach(&v_AIL_LogFunc, &AIL_LogFunc);
DetourAttach(&v_Miles_Initialize, &Miles_Initialize);
}
void MilesCore_Detach()
{
DetourDetach(&v_AIL_LogFunc, &AIL_LogFunc);
DetourDetach(&v_Miles_Initialize, &Miles_Initialize);
}

10
r5dev/vproj/clientsdk.vcxproj
View File

@ -15,7 +15,8 @@
<ClCompile Include="..\bsplib\bsplib.cpp" />
<ClCompile Include="..\client\cdll_engine_int.cpp" />
<ClCompile Include="..\client\vengineclient_impl.cpp" />
<ClCompile Include="..\codecs\bink_impl.cpp" />
<ClCompile Include="..\codecs\bink\bink_impl.cpp" />
<ClCompile Include="..\codecs\Miles\miles_impl.cpp" />
<ClCompile Include="..\common\netmessages.cpp" />
<ClCompile Include="..\common\opcodes.cpp" />
<ClCompile Include="..\core\dllmain.cpp" />
@ -82,7 +83,6 @@
<ClCompile Include="..\mathlib\ssenoise.cpp" />
<ClCompile Include="..\mathlib\transform.cpp" />
<ClCompile Include="..\mathlib\vmatrix.cpp" />
<ClCompile Include="..\milessdk\shared\core.cpp" />
<ClCompile Include="..\networksystem\listmanager.cpp" />
<ClCompile Include="..\networksystem\pylon.cpp" />
<ClCompile Include="..\pluginsystem\pluginsystem.cpp" />
@ -157,7 +157,9 @@
<ClInclude Include="..\bsplib\bsplib.h" />
<ClInclude Include="..\client\cdll_engine_int.h" />
<ClInclude Include="..\client\vengineclient_impl.h" />
<ClInclude Include="..\codecs\bink_impl.h" />
<ClInclude Include="..\codecs\bink\bink_impl.h" />
<ClInclude Include="..\codecs\Miles\miles_impl.h" />
<ClInclude Include="..\codecs\Miles\radshal_wasapi.h" />
<ClInclude Include="..\common\igameserverdata.h" />
<ClInclude Include="..\common\netmessages.h" />
<ClInclude Include="..\common\opcodes.h" />
@ -246,8 +248,6 @@
<ClInclude Include="..\mathlib\vector4d.h" />
<ClInclude Include="..\mathlib\vmatrix.h" />
<ClInclude Include="..\mathlib\vplane.h" />
<ClInclude Include="..\milessdk\shared\core.h" />
<ClInclude Include="..\milessdk\win64_rrthreads.h" />
<ClInclude Include="..\networksystem\listmanager.h" />
<ClInclude Include="..\networksystem\pylon.h" />
<ClInclude Include="..\networksystem\serverlisting.h" />

34
r5dev/vproj/clientsdk.vcxproj.filters
View File

@ -109,9 +109,6 @@
<Filter Include="sdk\materialsystem">
<UniqueIdentifier>{55bb4f60-5f5a-4780-a7a2-b3db51c53680}</UniqueIdentifier>
</Filter>
<Filter Include="sdk\milessdk">
<UniqueIdentifier>{f52dfb17-f5bd-4258-91a2-500587bee708}</UniqueIdentifier>
</Filter>
<Filter Include="sdk\tier1">
<UniqueIdentifier>{c5adc45b-d14c-4d52-9835-29948cab931a}</UniqueIdentifier>
</Filter>
@ -232,12 +229,15 @@
<Filter Include="sdk\public\materialsystem">
<UniqueIdentifier>{565eefdf-15cf-47dc-a22b-0d3521e8c5c9}</UniqueIdentifier>
</Filter>
<Filter Include="sdk\milessdk\shared">
<UniqueIdentifier>{7823b9d7-9d02-4936-b326-4b6351df0c7e}</UniqueIdentifier>
</Filter>
<Filter Include="sdk\codecs">
<UniqueIdentifier>{3b14367c-17f1-43d8-b8f5-a55506ac961f}</UniqueIdentifier>
</Filter>
<Filter Include="sdk\codecs\bink">
<UniqueIdentifier>{20572d96-e629-45f1-8ae2-224a776bfb19}</UniqueIdentifier>
</Filter>
<Filter Include="sdk\codecs\miles">
<UniqueIdentifier>{5529291a-e3b6-44a7-8edf-f0fe4e0ac4dc}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\client\cdll_engine_int.cpp">
@ -624,11 +624,11 @@
<ClCompile Include="..\tier1\utlbuffer.cpp">
<Filter>sdk\tier1</Filter>
</ClCompile>
<ClCompile Include="..\milessdk\shared\core.cpp">
<Filter>sdk\milessdk\shared</Filter>
<ClCompile Include="..\codecs\bink\bink_impl.cpp">
<Filter>sdk\codecs\bink</Filter>
</ClCompile>
<ClCompile Include="..\codecs\bink_impl.cpp">
<Filter>sdk\codecs</Filter>
<ClCompile Include="..\codecs\Miles\miles_impl.cpp">
<Filter>sdk\codecs\miles</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
@ -1112,9 +1112,6 @@
<ClInclude Include="..\engine\debugoverlay.h">
<Filter>sdk\engine</Filter>
</ClInclude>
<ClInclude Include="..\milessdk\win64_rrthreads.h">
<Filter>sdk\milessdk</Filter>
</ClInclude>
<ClInclude Include="..\mathlib\fbits.h">
<Filter>sdk\mathlib</Filter>
</ClInclude>
@ -1832,11 +1829,14 @@
<ClInclude Include="..\public\ipackedstore.h">
<Filter>sdk\public</Filter>
</ClInclude>
<ClInclude Include="..\milessdk\shared\core.h">
<Filter>sdk\milessdk\shared</Filter>
<ClInclude Include="..\codecs\bink\bink_impl.h">
<Filter>sdk\codecs\bink</Filter>
</ClInclude>
<ClInclude Include="..\codecs\bink_impl.h">
<Filter>sdk\codecs</Filter>
<ClInclude Include="..\codecs\Miles\miles_impl.h">
<Filter>sdk\codecs\miles</Filter>
</ClInclude>
<ClInclude Include="..\codecs\Miles\radshal_wasapi.h">
<Filter>sdk\codecs\miles</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>

10
r5dev/vproj/gamesdk.vcxproj
View File

@ -15,7 +15,8 @@
<ClCompile Include="..\bsplib\bsplib.cpp" />
<ClCompile Include="..\client\cdll_engine_int.cpp" />
<ClCompile Include="..\client\vengineclient_impl.cpp" />
<ClCompile Include="..\codecs\bink_impl.cpp" />
<ClCompile Include="..\codecs\bink\bink_impl.cpp" />
<ClCompile Include="..\codecs\Miles\miles_impl.cpp" />
<ClCompile Include="..\common\netmessages.cpp" />
<ClCompile Include="..\common\opcodes.cpp" />
<ClCompile Include="..\core\dllmain.cpp" />
@ -90,7 +91,6 @@
<ClCompile Include="..\mathlib\ssenoise.cpp" />
<ClCompile Include="..\mathlib\transform.cpp" />
<ClCompile Include="..\mathlib\vmatrix.cpp" />
<ClCompile Include="..\milessdk\shared\core.cpp" />
<ClCompile Include="..\networksystem\bansystem.cpp" />
<ClCompile Include="..\networksystem\listmanager.cpp" />
<ClCompile Include="..\networksystem\pylon.cpp" />
@ -168,7 +168,9 @@
<ClInclude Include="..\bsplib\bsplib.h" />
<ClInclude Include="..\client\cdll_engine_int.h" />
<ClInclude Include="..\client\vengineclient_impl.h" />
<ClInclude Include="..\codecs\bink_impl.h" />
<ClInclude Include="..\codecs\bink\bink_impl.h" />
<ClInclude Include="..\codecs\Miles\miles_impl.h" />
<ClInclude Include="..\codecs\Miles\radshal_wasapi.h" />
<ClInclude Include="..\common\igameserverdata.h" />
<ClInclude Include="..\common\netmessages.h" />
<ClInclude Include="..\common\opcodes.h" />
@ -270,8 +272,6 @@
<ClInclude Include="..\mathlib\vector4d.h" />
<ClInclude Include="..\mathlib\vmatrix.h" />
<ClInclude Include="..\mathlib\vplane.h" />
<ClInclude Include="..\milessdk\shared\core.h" />
<ClInclude Include="..\milessdk\win64_rrthreads.h" />
<ClInclude Include="..\networksystem\bansystem.h" />
<ClInclude Include="..\networksystem\listmanager.h" />
<ClInclude Include="..\networksystem\pylon.h" />

34
r5dev/vproj/gamesdk.vcxproj.filters
View File

@ -112,9 +112,6 @@
<Filter Include="sdk\materialsystem">
<UniqueIdentifier>{55bb4f60-5f5a-4780-a7a2-b3db51c53680}</UniqueIdentifier>
</Filter>
<Filter Include="sdk\milessdk">
<UniqueIdentifier>{f52dfb17-f5bd-4258-91a2-500587bee708}</UniqueIdentifier>
</Filter>
<Filter Include="sdk\tier1">
<UniqueIdentifier>{c5adc45b-d14c-4d52-9835-29948cab931a}</UniqueIdentifier>
</Filter>
@ -241,12 +238,15 @@
<Filter Include="sdk\public\materialsystem">
<UniqueIdentifier>{1718d302-db9b-4d2e-b666-cb9f2712eef4}</UniqueIdentifier>
</Filter>
<Filter Include="sdk\milessdk\shared">
<UniqueIdentifier>{14049eac-0367-4235-b555-c4815be3e905}</UniqueIdentifier>
</Filter>
<Filter Include="sdk\codecs">
<UniqueIdentifier>{389ac126-74f8-456a-93f3-aae243804dcc}</UniqueIdentifier>
</Filter>
<Filter Include="sdk\codecs\bink">
<UniqueIdentifier>{e10598dd-d765-4394-a017-a3847ded2045}</UniqueIdentifier>
</Filter>
<Filter Include="sdk\codecs\miles">
<UniqueIdentifier>{f53df686-70b6-4883-a966-1eb3fd7eb2b1}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\client\vengineclient_impl.cpp">
@ -666,11 +666,11 @@
<ClCompile Include="..\tier1\utlbuffer.cpp">
<Filter>sdk\tier1</Filter>
</ClCompile>
<ClCompile Include="..\milessdk\shared\core.cpp">
<Filter>sdk\milessdk\shared</Filter>
<ClCompile Include="..\codecs\bink\bink_impl.cpp">
<Filter>sdk\codecs\bink</Filter>
</ClCompile>
<ClCompile Include="..\codecs\bink_impl.cpp">
<Filter>sdk\codecs</Filter>
<ClCompile Include="..\codecs\Miles\miles_impl.cpp">
<Filter>sdk\codecs\miles</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
@ -1157,9 +1157,6 @@
<ClInclude Include="..\engine\debugoverlay.h">
<Filter>sdk\engine</Filter>
</ClInclude>
<ClInclude Include="..\milessdk\win64_rrthreads.h">
<Filter>sdk\milessdk</Filter>
</ClInclude>
<ClInclude Include="..\mathlib\fbits.h">
<Filter>sdk\mathlib</Filter>
</ClInclude>
@ -1928,11 +1925,14 @@
<ClInclude Include="..\public\ipackedstore.h">
<Filter>sdk\public</Filter>
</ClInclude>
<ClInclude Include="..\milessdk\shared\core.h">
<Filter>sdk\milessdk\shared</Filter>
<ClInclude Include="..\codecs\bink\bink_impl.h">
<Filter>sdk\codecs\bink</Filter>
</ClInclude>
<ClInclude Include="..\codecs\bink_impl.h">
<Filter>sdk\codecs</Filter>
<ClInclude Include="..\codecs\Miles\miles_impl.h">
<Filter>sdk\codecs\miles</Filter>
</ClInclude>
<ClInclude Include="..\codecs\Miles\radshal_wasapi.h">
<Filter>sdk\codecs\miles</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>