moved plugin manager to core.
Can someone fix it on windows? git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1840 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
9f5aaf8413
commit
9cae49bb52
|
@ -18,7 +18,7 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "Globals.h"
|
//#include "Globals.h"
|
||||||
#include "FileSearch.h"
|
#include "FileSearch.h"
|
||||||
#include "FileUtil.h"
|
#include "FileUtil.h"
|
||||||
#include "PluginManager.h"
|
#include "PluginManager.h"
|
||||||
|
@ -60,7 +60,7 @@ CPluginManager::~CPluginManager()
|
||||||
// ----------------------------------------
|
// ----------------------------------------
|
||||||
// Create list of available plugins
|
// Create list of available plugins
|
||||||
// -------------
|
// -------------
|
||||||
void CPluginManager::ScanForPlugins(wxWindow* _wxWindow)
|
void CPluginManager::ScanForPlugins()
|
||||||
{
|
{
|
||||||
m_PluginInfos.clear();
|
m_PluginInfos.clear();
|
||||||
|
|
||||||
|
@ -75,22 +75,6 @@ void CPluginManager::ScanForPlugins(wxWindow* _wxWindow)
|
||||||
|
|
||||||
if (rFilenames.size() > 0)
|
if (rFilenames.size() > 0)
|
||||||
{
|
{
|
||||||
/*
|
|
||||||
wxProgressDialog dialog(_T("Scanning for Plugins"),
|
|
||||||
_T("Scanning..."),
|
|
||||||
(int)rFilenames.size(), // range
|
|
||||||
_wxWindow, // parent
|
|
||||||
wxPD_CAN_ABORT |
|
|
||||||
wxPD_APP_MODAL |
|
|
||||||
// wxPD_AUTO_HIDE | -- try this as well
|
|
||||||
wxPD_ELAPSED_TIME |
|
|
||||||
wxPD_ESTIMATED_TIME |
|
|
||||||
wxPD_REMAINING_TIME |
|
|
||||||
wxPD_SMOOTH // - makes indeterminate mode bar on WinXP very small
|
|
||||||
);
|
|
||||||
dialog.CenterOnParent();
|
|
||||||
*/
|
|
||||||
|
|
||||||
for (size_t i = 0; i < rFilenames.size(); i++)
|
for (size_t i = 0; i < rFilenames.size(); i++)
|
||||||
{
|
{
|
||||||
std::string orig_name = rFilenames[i];
|
std::string orig_name = rFilenames[i];
|
||||||
|
@ -102,18 +86,6 @@ void CPluginManager::ScanForPlugins(wxWindow* _wxWindow)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
wxString msg;
|
|
||||||
char temp[128];
|
|
||||||
sprintf(temp,"Scanning %s", FileName.c_str());
|
|
||||||
msg = wxString::FromAscii(temp);
|
|
||||||
bool Cont = dialog.Update((int)i, msg);
|
|
||||||
|
|
||||||
if (!Cont)
|
|
||||||
{
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
CPluginInfo PluginInfo(orig_name.c_str());
|
CPluginInfo PluginInfo(orig_name.c_str());
|
||||||
if (PluginInfo.IsValid())
|
if (PluginInfo.IsValid())
|
||||||
{
|
{
|
|
@ -40,7 +40,7 @@ class CPluginManager
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static CPluginManager& GetInstance() {return(m_Instance);}
|
static CPluginManager& GetInstance() {return(m_Instance);}
|
||||||
void ScanForPlugins(wxWindow* _wxWindow);
|
void ScanForPlugins();
|
||||||
void OpenConfig(void* _Parent, const char *_rFilename);
|
void OpenConfig(void* _Parent, const char *_rFilename);
|
||||||
void OpenDebug(void* _Parent, const char *_rFilename, bool Type, bool Show);
|
void OpenDebug(void* _Parent, const char *_rFilename, bool Type, bool Show);
|
||||||
const CPluginInfos& GetPluginInfos() {return(m_PluginInfos);}
|
const CPluginInfos& GetPluginInfos() {return(m_PluginInfos);}
|
|
@ -14,6 +14,7 @@ files = ["Console.cpp",
|
||||||
"PatchEngine.cpp",
|
"PatchEngine.cpp",
|
||||||
"State.cpp",
|
"State.cpp",
|
||||||
"Tracer.cpp",
|
"Tracer.cpp",
|
||||||
|
'PluginManager.cpp',
|
||||||
"VolumeHandler.cpp",
|
"VolumeHandler.cpp",
|
||||||
"Boot/Boot.cpp",
|
"Boot/Boot.cpp",
|
||||||
"Boot/Boot_BIOSEmu.cpp",
|
"Boot/Boot_BIOSEmu.cpp",
|
||||||
|
|
|
@ -65,7 +65,7 @@
|
||||||
|
|
||||||
#include "Plugins/Plugin_DSP.h" // new stuff, to let us open the DLLDebugger
|
#include "Plugins/Plugin_DSP.h" // new stuff, to let us open the DLLDebugger
|
||||||
#include "Plugins/Plugin_Video.h" // new stuff, to let us open the DLLDebugger
|
#include "Plugins/Plugin_Video.h" // new stuff, to let us open the DLLDebugger
|
||||||
#include "../../DolphinWX/Src/PluginManager.h"
|
#include "PluginManager.h"
|
||||||
#include "../../DolphinWX/Src/Config.h"
|
#include "../../DolphinWX/Src/Config.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -65,7 +65,7 @@
|
||||||
|
|
||||||
#include "Plugins/Plugin_DSP.h" // new stuff, to let us open the DLLDebugger
|
#include "Plugins/Plugin_DSP.h" // new stuff, to let us open the DLLDebugger
|
||||||
#include "Plugins/Plugin_Video.h" // new stuff, to let us open the DLLDebugger
|
#include "Plugins/Plugin_Video.h" // new stuff, to let us open the DLLDebugger
|
||||||
#include "../../DolphinWX/Src/PluginManager.h"
|
#include "PluginManager.h"
|
||||||
#include "../../DolphinWX/Src/Config.h"
|
#include "../../DolphinWX/Src/Config.h"
|
||||||
|
|
||||||
|
|
||||||
|
@ -497,4 +497,4 @@ void CCodeWindow::OnToggleMemoryWindow(wxCommandEvent& event)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
|
@ -308,7 +308,7 @@ CFrame::CFrame(wxFrame* parent,
|
||||||
|
|
||||||
Show(); // Show the window
|
Show(); // Show the window
|
||||||
|
|
||||||
CPluginManager::GetInstance().ScanForPlugins(this);
|
CPluginManager::GetInstance().ScanForPlugins();
|
||||||
|
|
||||||
//if we are ever going back to optional iso caching:
|
//if we are ever going back to optional iso caching:
|
||||||
//m_GameListCtrl->Update(SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableIsoCache);
|
//m_GameListCtrl->Update(SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableIsoCache);
|
||||||
|
|
|
@ -29,7 +29,7 @@ if wxenv['HAVE_WX']:
|
||||||
'ISOProperties.cpp',
|
'ISOProperties.cpp',
|
||||||
'MemcardManager.cpp',
|
'MemcardManager.cpp',
|
||||||
'MemoryCards/GCMemcard.cpp',
|
'MemoryCards/GCMemcard.cpp',
|
||||||
'PluginManager.cpp',
|
# 'PluginManager.cpp',
|
||||||
'PatchAddEdit.cpp',
|
'PatchAddEdit.cpp',
|
||||||
'CheatsWindow.cpp',
|
'CheatsWindow.cpp',
|
||||||
'stdafx.cpp',
|
'stdafx.cpp',
|
||||||
|
|
Loading…
Reference in New Issue