ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Project64] Clean up code related to plugins

This commit is contained in:
zilmar 2016-01-18 22:26:15 +11:00
parent df04d377e0
commit 821922f133
10 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Project64-core/Plugins/AudioPlugin.cpp
View File

@ -14,7 +14,7 @@
#include <Project64-core/N64System/Mips/MemoryVirtualMem.h>
#include <Project64-core/N64System/Mips/RegisterClass.h>
#include <Project64-core/N64System/N64Class.h>
#include "AudioPlugin.h"
#include <Project64-core/Plugins/AudioPlugin.h>
#ifdef _WIN32
#include <Windows.h>
#endif
@ -64,8 +64,8 @@ bool CAudioPlugin::Initiate(CN64System * System, RenderWindow * Window)
{
struct AUDIO_INFO
{
HWND hwnd;
HINSTANCE hinst;
void * hwnd;
void * hinst;
int32_t MemoryBswaped; // If this is set to TRUE, then the memory has been pre
@ -97,9 +97,9 @@ bool CAudioPlugin::Initiate(CN64System * System, RenderWindow * Window)
AUDIO_INFO Info = { 0 };
Info.hwnd = (HWND)Window->GetWindowHandle();
Info.hinst = GetModuleHandle(NULL);
Info.MemoryBswaped = TRUE;
Info.hwnd = Window ? Window->GetWindowHandle() : NULL;
Info.hinst = Window ? Window->GetModuleInstance() : NULL;;
Info.MemoryBswaped = true;
Info.CheckInterrupts = DummyCheckInterrupts;
// We are initializing the plugin before any rom is loaded so we do not have any correct
@ -167,13 +167,15 @@ bool CAudioPlugin::Initiate(CN64System * System, RenderWindow * Window)
void CAudioPlugin::UnloadPluginDetails(void)
{
#ifdef _WIN32
if (m_hAudioThread)
{
WriteTrace(TraceAudioPlugin, TraceDebug, "Terminate Audio Thread");
TerminateThread(m_hAudioThread, 0);
m_hAudioThread = NULL;
}
AiDacrateChanged = NULL;
#endif
AiDacrateChanged = NULL;
AiLenChanged = NULL;
AiReadLength = NULL;
AiUpdate = NULL;
@ -190,6 +192,7 @@ void CAudioPlugin::DacrateChanged(SYSTEM_TYPE Type)
AiDacrateChanged(Type);
}
#ifdef _WIN32
void CAudioPlugin::AudioThread(CAudioPlugin * _this)
{
SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_TIME_CRITICAL);
@ -201,4 +204,5 @@ void CAudioPlugin::AudioThread(CAudioPlugin * _this)
{
_this->AiUpdate(true);
}
}
}
#endif

2
Source/Project64-core/Plugins/AudioPlugin.h
View File

@ -9,7 +9,7 @@
* *
****************************************************************************/
#pragma once
#include "PluginBase.h"
#include <Project64-core/Plugins/PluginBase.h>
class CAudioPlugin : public CPlugin
{

2
Source/Project64-core/Plugins/ControllerPlugin.h
View File

@ -9,7 +9,7 @@
* *
****************************************************************************/
#pragma once
#include "PluginBase.h"
#include <Project64-core/Plugins/PluginBase.h>
#pragma warning(push)
#pragma warning(disable : 4201) // warning C4201: nonstandard extension used : nameless struct/union

2
Source/Project64-core/Plugins/GFXPlugin.h
View File

@ -9,7 +9,7 @@
* *
****************************************************************************/
#pragma once
#include "PluginBase.h"
#include <Project64-core/Plugins/PluginBase.h>
class CGfxPlugin : public CPlugin
{

2
Source/Project64-core/Plugins/PluginBase.cpp
View File

@ -9,7 +9,7 @@
* *
****************************************************************************/
#include "stdafx.h"
#include "PluginBase.h"
#include <Project64-core/Plugins/PluginBase.h>
CPlugin::CPlugin() :
DllAbout(NULL),

2
Source/Project64-core/Plugins/RSPPlugin.cpp
View File

@ -14,7 +14,7 @@
#include <Project64-core/N64System/Mips/RegisterClass.h>
#include "RSPPlugin.h"
#include "GFXPlugin.h"
#include "AudioPlugin.h"
#include <Project64-core/Plugins/AudioPlugin.h>
void DummyFunc1(int a) { a += 1; }

2
Source/Project64-core/Plugins/RSPPlugin.h
View File

@ -9,7 +9,7 @@
* *
****************************************************************************/
#pragma once
#include "PluginBase.h"
#include <Project64-core/Plugins/PluginBase.h>
class CRSP_Plugin : public CPlugin
{

4
Source/Project64/Plugins/PluginList.cpp
View File

@ -85,8 +85,8 @@ void CPluginList::AddPluginFromDir(CPath Dir)
continue;
}
void(__cdecl *GetDllInfo) (PLUGIN_INFO * PluginInfo);
GetDllInfo = (void(__cdecl *)(PLUGIN_INFO *))GetProcAddress(hLib, "GetDllInfo");
void(CALL *GetDllInfo) (PLUGIN_INFO * PluginInfo);
GetDllInfo = (void(CALL *)(PLUGIN_INFO *))GetProcAddress(hLib, "GetDllInfo");
if (GetDllInfo == NULL)
{
continue;

4
Source/Project64/UserInterface/Settings/SettingsPage-Game-Plugin.cpp
View File

@ -126,8 +126,8 @@ void CGamePluginPage::ShowAboutButton(int id)
}
//Get DLL about
void(__cdecl *DllAbout) (HWND hWnd);
DllAbout = (void(__cdecl *)(HWND))GetProcAddress(hLib, "DllAbout");
void(CALL *DllAbout) (HWND hWnd);
DllAbout = (void(CALL *)(HWND))GetProcAddress(hLib, "DllAbout");
//call the function from the dll
DllAbout(m_hWnd);

4
Source/Project64/UserInterface/Settings/SettingsPage-Plugin.cpp
View File

@ -118,8 +118,8 @@ void COptionPluginPage::ShowAboutButton(int id)
}
//Get DLL about
void(__cdecl *DllAbout) (HWND hWnd);
DllAbout = (void(__cdecl *)(HWND))GetProcAddress(hLib, "DllAbout");
void(CALL *DllAbout) (HWND hWnd);
DllAbout = (void(CALL *)(HWND))GetProcAddress(hLib, "DllAbout");
//call the function from the dll
DllAbout(m_hWnd);