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:
parent
888465868d
commit
bef60f8ec0
|
@ -570,7 +570,11 @@ void Callback_VideoCopiedToXFB()
|
|||
char temp[256];
|
||||
sprintf(temp, "FPS:%8.2f - Core: %s | %s - Speed: %i MHz [Real: %i + IdleSkip: %i] / %i MHz",
|
||||
(float)frames / t,
|
||||
_CoreParameter.bUseJIT ? "JIT" : "Interpreter",
|
||||
#ifdef _M_IX86
|
||||
_CoreParameter.bUseJIT ? "JIT32" : "Int32",
|
||||
#else
|
||||
_CoreParameter.bUseJIT ? "JIT64" : "Int64",
|
||||
#endif
|
||||
_CoreParameter.bUseDualCore ? "DC" : "SC",
|
||||
(int)(diff),
|
||||
(int)(diff - idleDiff),
|
||||
|
@ -582,7 +586,6 @@ void Callback_VideoCopiedToXFB()
|
|||
|
||||
Host_UpdateStatusBar(temp);
|
||||
|
||||
|
||||
frames = 0;
|
||||
Timer.Update();
|
||||
}
|
||||
|
|
|
@ -15,11 +15,10 @@
|
|||
// Official SVN repository and contact information can be found at
|
||||
// http://code.google.com/p/dolphin-emu/
|
||||
|
||||
|
||||
#include <string> // System
|
||||
#include <vector>
|
||||
|
||||
//#include "Globals.h" // Local
|
||||
#include "Common.h"
|
||||
#include "PluginManager.h"
|
||||
#include "ConfigManager.h"
|
||||
#include "LogManager.h"
|
||||
|
@ -218,13 +217,11 @@ int CPluginManager::OkayToInitPlugin(int Plugin)
|
|||
return -1;
|
||||
}
|
||||
|
||||
|
||||
PLUGIN_GLOBALS* CPluginManager::GetGlobals()
|
||||
{
|
||||
return m_PluginGlobals;
|
||||
}
|
||||
|
||||
|
||||
// ----------------------------------------
|
||||
// Create list of available plugins
|
||||
// -------------
|
||||
|
@ -304,9 +301,9 @@ Common::PluginDSP *CPluginManager::GetDSP()
|
|||
Common::PluginVideo *CPluginManager::GetVideo()
|
||||
{
|
||||
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;
|
||||
} else
|
||||
else
|
||||
FreeVideo();
|
||||
}
|
||||
|
||||
|
@ -331,6 +328,7 @@ void CPluginManager::FreePad(u32 pad)
|
|||
}
|
||||
}
|
||||
|
||||
///////////////////////////////////////////
|
||||
// Call DLL functions
|
||||
|
||||
// Open config window. Input: _rFilename = Plugin filename , Type = Plugin type
|
||||
|
|
Loading…
Reference in New Issue