GTK : Removed 2 global vars

This commit is contained in:
bgk 2009-01-23 14:40:18 +00:00
parent 34da50d9be
commit 9788aba1e3
3 changed files with 7 additions and 15 deletions

View File

@ -39,11 +39,6 @@ u16 systemGbPalette[24];
int emulating;
int RGB_LOW_BITS_MASK;
// Extra vars, only used for the GUI
//
int systemRenderedFrames;
int systemFPS;
inline VBA::Window * GUI()
{
return VBA::Window::poGetInstance();
@ -62,7 +57,6 @@ void systemMessage(int _iId, const char * _csFormat, ...)
void systemDrawScreen()
{
GUI()->vDrawScreen();
systemRenderedFrames++;
}
bool systemReadJoypads()
@ -77,9 +71,6 @@ u32 systemReadJoypad(int joy)
void systemShowSpeed(int _iSpeed)
{
systemFPS = systemRenderedFrames;
systemRenderedFrames = 0;
GUI()->vShowSpeed(_iSpeed);
}

View File

@ -43,8 +43,6 @@
#include "screenarea-opengl.h"
#endif // USE_OPENGL
extern int systemRenderedFrames;
extern int systemFPS;
extern int RGB_LOW_BITS_MASK;
@ -556,12 +554,11 @@ void Window::vInitSystem()
systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED;
systemFrameSkip = 2;
systemRenderedFrames = 0;
systemFPS = 0;
emulating = 0;
gbFrameSkip = 0;
m_iFrameCount = 0;
soundInit();
}
@ -1149,6 +1146,7 @@ void Window::vPopupErrorV(const char * _csFormat, va_list _args)
void Window::vDrawScreen()
{
m_poScreenArea->vDrawPixels(pix);
m_iFrameCount++;
}
void Window::vDrawDefaultScreen()
@ -1173,9 +1171,11 @@ void Window::vShowSpeed(int _iSpeed)
else if (m_eShowSpeed == ShowDetailed)
{
snprintf(csTitle, 50, "VBA-M - %d%% (%d, %d fps)",
_iSpeed, systemFrameSkip, systemFPS);
_iSpeed, systemFrameSkip, m_iFrameCount);
set_title(csTitle);
}
m_iFrameCount = 0;
}
void Window::vComputeFrameskip(int _iRate)

View File

@ -245,6 +245,7 @@ private:
int m_bFullscreen;
int m_iScreenWidth;
int m_iScreenHeight;
int m_iFrameCount;
std::string m_sRomFile;
ECartridge m_eCartridge;