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

Show 32/64-bitness in title bar. Fix up some screwed up indentation :( 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2049 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard 2009-02-01 13:15:21 +00:00
parent 888465868d
commit bef60f8ec0
2 changed files with 237 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Core/Core/Src/Core.cpp
View File

@ -345,12 +345,12 @@ THREAD_RETURN EmuThread(void *pArg)
PADInitialize.pLog = Callback_PADLog; PADInitialize.pLog = Callback_PADLog;
PADInitialize.padNumber = i; PADInitialize.padNumber = i;
// Check if we should init the plugin // Check if we should init the plugin
if(Plugins.OkayToInitPlugin(i)) if (Plugins.OkayToInitPlugin(i))
{ {
Plugins.GetPad(i)->Initialize(&PADInitialize); Plugins.GetPad(i)->Initialize(&PADInitialize);
// Check if joypad open failed, in that case try again // Check if joypad open failed, in that case try again
if(PADInitialize.padNumber == -1) if (PADInitialize.padNumber == -1)
{ {
Plugins.GetPad(i)->Shutdown(); Plugins.GetPad(i)->Shutdown();
Plugins.FreePad(i); Plugins.FreePad(i);
@ -560,8 +560,8 @@ void Callback_VideoCopiedToXFB()
u64 newTicks = CoreTiming::GetTicks(); u64 newTicks = CoreTiming::GetTicks();
u64 newIdleTicks = CoreTiming::GetIdleTicks(); u64 newIdleTicks = CoreTiming::GetIdleTicks();
s64 diff = (newTicks - ticks)/1000000; s64 diff = (newTicks - ticks) / 1000000;
s64 idleDiff = (newIdleTicks - idleTicks)/1000000; s64 idleDiff = (newIdleTicks - idleTicks) / 1000000;
ticks = newTicks; ticks = newTicks;
idleTicks = newIdleTicks; idleTicks = newIdleTicks;
@ -570,19 +570,22 @@ void Callback_VideoCopiedToXFB()
char temp[256]; char temp[256];
sprintf(temp, "FPS:%8.2f - Core: %s | %s - Speed: %i MHz [Real: %i + IdleSkip: %i] / %i MHz", sprintf(temp, "FPS:%8.2f - Core: %s | %s - Speed: %i MHz [Real: %i + IdleSkip: %i] / %i MHz",
(float)frames / t, (float)frames / t,
_CoreParameter.bUseJIT ? "JIT" : "Interpreter", #ifdef _M_IX86
_CoreParameter.bUseJIT ? "JIT32" : "Int32",
#else
_CoreParameter.bUseJIT ? "JIT64" : "Int64",
#endif
_CoreParameter.bUseDualCore ? "DC" : "SC", _CoreParameter.bUseDualCore ? "DC" : "SC",
(int)(diff), (int)(diff),
(int)(diff-idleDiff), (int)(diff - idleDiff),
(int)(idleDiff), (int)(idleDiff),
SystemTimers::GetTicksPerSecond()/1000000); SystemTimers::GetTicksPerSecond() / 1000000);
if (g_pUpdateFPSDisplay != NULL) if (g_pUpdateFPSDisplay != NULL)
g_pUpdateFPSDisplay(temp); g_pUpdateFPSDisplay(temp);
Host_UpdateStatusBar(temp); Host_UpdateStatusBar(temp);
frames = 0; frames = 0;
Timer.Update(); Timer.Update();
} }

18
Source/Core/Core/Src/PluginManager.cpp
View File

@ -15,11 +15,10 @@
// Official SVN repository and contact information can be found at // Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/ // http://code.google.com/p/dolphin-emu/
#include <string> // System #include <string> // System
#include <vector> #include <vector>
//#include "Globals.h" // Local #include "Common.h"
#include "PluginManager.h" #include "PluginManager.h"
#include "ConfigManager.h" #include "ConfigManager.h"
#include "LogManager.h" #include "LogManager.h"
@ -43,10 +42,10 @@ CPluginManager::CPluginManager() :
m_video = NULL; m_video = NULL;
m_dsp = NULL; m_dsp = NULL;
for (int i=0;i< MAXPADS;i++) for (int i = 0; i < MAXPADS; i++)
m_pad[i] = NULL; m_pad[i] = NULL;
for (int i=0;i< MAXWIIMOTES;i++) for (int i = 0; i < MAXWIIMOTES; i++)
m_wiimote[i] = NULL; m_wiimote[i] = NULL;
} }
@ -210,7 +209,7 @@ void *CPluginManager::LoadPlugin(const char *_rFilename, int Number)
int CPluginManager::OkayToInitPlugin(int Plugin) int CPluginManager::OkayToInitPlugin(int Plugin)
{ {
// Compare it to the earlier plugins // Compare it to the earlier plugins
for(int i = 0; i < Plugin; i++) for (int i = 0; i < Plugin; i++)
if (m_params.m_strPadPlugin[Plugin] == m_params.m_strPadPlugin[i]) if (m_params.m_strPadPlugin[Plugin] == m_params.m_strPadPlugin[i])
return i; return i;
@ -218,13 +217,11 @@ int CPluginManager::OkayToInitPlugin(int Plugin)
return -1; return -1;
} }
PLUGIN_GLOBALS* CPluginManager::GetGlobals() PLUGIN_GLOBALS* CPluginManager::GetGlobals()
{ {
return m_PluginGlobals; return m_PluginGlobals;
} }
// ---------------------------------------- // ----------------------------------------
// Create list of available plugins // Create list of available plugins
// ------------- // -------------
@ -269,7 +266,7 @@ Common::PluginPAD *CPluginManager::GetPad(int controller)
return m_pad[controller]; return m_pad[controller];
// Else do this // Else do this
if(OkayToInitPlugin(controller) == -1) { if (OkayToInitPlugin(controller) == -1) {
m_pad[controller] = (Common::PluginPAD*)LoadPlugin(m_params.m_strPadPlugin[controller].c_str(), controller); m_pad[controller] = (Common::PluginPAD*)LoadPlugin(m_params.m_strPadPlugin[controller].c_str(), controller);
Console::Print("LoadPlugin: %i\n", controller); Console::Print("LoadPlugin: %i\n", controller);
} }
@ -304,9 +301,9 @@ Common::PluginDSP *CPluginManager::GetDSP()
Common::PluginVideo *CPluginManager::GetVideo() Common::PluginVideo *CPluginManager::GetVideo()
{ {
if (m_video != NULL && m_video->IsValid()) { if (m_video != NULL && m_video->IsValid()) {
if (m_video->GetFilename() == m_params.m_strVideoPlugin) { if (m_video->GetFilename() == m_params.m_strVideoPlugin)
return m_video; return m_video;
} else else
FreeVideo(); FreeVideo();
} }
@ -331,6 +328,7 @@ void CPluginManager::FreePad(u32 pad)
} }
} }
///////////////////////////////////////////
// Call DLL functions // Call DLL functions
// Open config window. Input: _rFilename = Plugin filename , Type = Plugin type // Open config window. Input: _rFilename = Plugin filename , Type = Plugin type