From 57c3a2568fecb3c552cdcfa7225ce91f33b6a0f3 Mon Sep 17 00:00:00 2001 From: pjgat09 Date: Sun, 24 Aug 2014 15:06:06 +0000 Subject: [PATCH] N64: A little cleanup of the jabo wrapper --- .../mupen64plus-video-jabo/main.cpp | 10 +--------- output/dll/mupen64plus-video-jabo.dll | Bin 26624 -> 26624 bytes 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/libmupen64plus/mupen64plus-video-jabo/main.cpp b/libmupen64plus/mupen64plus-video-jabo/main.cpp index a693d7f98a..a06e5fc18f 100644 --- a/libmupen64plus/mupen64plus-video-jabo/main.cpp +++ b/libmupen64plus/mupen64plus-video-jabo/main.cpp @@ -60,8 +60,6 @@ static int l_PluginInit = 0; HMODULE JaboDLL; -HANDLE window_thread = NULL; - HMODULE D3D8Dll; typedef void (*ptr_D3D8_SetRenderingCallback)(void (*callback)(int)); @@ -213,8 +211,8 @@ static void DebugMessage(int level, const char *message, ...) } #pragma region (De-)Initialization + /* Mupen64Plus plugin functions */ -// TODO EXPORT m64p_error CALL PluginStartup(m64p_dynlib_handle CoreLibHandle, void *Context, void (*DebugCallback)(void *, int, const char *)) { @@ -265,13 +263,11 @@ EXPORT m64p_error CALL PluginStartup(m64p_dynlib_handle CoreLibHandle, void *Con return M64ERR_SUCCESS; } -// TODO EXPORT m64p_error CALL PluginShutdown(void) { LOG("API WRAPPER:\t PluginShutdown") OldAPI::CloseDLL(); - TerminateThread(window_thread,0); D3D8_CloseDLL(); FreeLibrary(D3D8Dll); FreeLibrary(JaboDLL); @@ -289,7 +285,6 @@ EXPORT m64p_error CALL PluginShutdown(void) return M64ERR_SUCCESS; } -// TODO EXPORT int CALL RomOpen(void) { LOG("API WRAPPER:\t RomOpen") @@ -303,7 +298,6 @@ EXPORT int CALL RomOpen(void) return 1; } -// TODO EXPORT void CALL RomClosed( void ) { LOG("API WRAPPER:\t RomClosed") @@ -513,7 +507,6 @@ EXPORT void CALL ViWidthChanged(void) OldAPI::ViWidthChanged(); } -// TODO EXPORT void CALL ReadScreen2(void *dest, int *width, int *height, int bFront) { LOG("API WRAPPER:\t ReadScreen2") @@ -523,7 +516,6 @@ EXPORT void CALL ReadScreen2(void *dest, int *width, int *height, int bFront) } } -// TODO EXPORT void CALL SetRenderingCallback(void (*callback)(int)) { LOG("API WRAPPER:\t SetRenderingCallback") diff --git a/output/dll/mupen64plus-video-jabo.dll b/output/dll/mupen64plus-video-jabo.dll index 2a99251be3d12f9b9df2efc517bcc4423a514f4b..0e222a17e44a9bb9487addb3e556251b41e2e73c 100644 GIT binary patch delta 5796 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 jy~%ExlVn