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

Fix warnings about non-static variables

This commit is contained in:
Tillmann Karras 2014-11-02 04:51:44 +01:00
parent f4fed0dea0
commit ff41dd479b
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/DolphinWX/MainNoGUI.cpp
View File

@ -55,10 +55,10 @@ void Host_Message(int Id)
} }
} }
void* windowHandle; static void* s_window_handle;
void* Host_GetRenderHandle() void* Host_GetRenderHandle()
{ {
return windowHandle; return s_window_handle;
} }
void Host_UpdateTitle(const std::string& title) void Host_UpdateTitle(const std::string& title)
@ -157,7 +157,7 @@ class PlatformX11 : public Platform
XSetWMProtocols(dpy, win, wmProtocols, 1); XSetWMProtocols(dpy, win, wmProtocols, 1);
XMapRaised(dpy, win); XMapRaised(dpy, win);
XFlush(dpy); XFlush(dpy);
windowHandle = (void *) win; s_window_handle = (void*) win;
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bDisableScreenSaver) if (SConfig::GetInstance().m_LocalCoreStartupParameter.bDisableScreenSaver)
X11Utils::InhibitScreensaver(dpy, win, true); X11Utils::InhibitScreensaver(dpy, win, true);

14
Source/Core/VideoCommon/AVIDump.cpp
View File

@ -51,7 +51,7 @@ static BITMAPINFOHEADER s_bitmap;
// so we have to save a frame and always be behind // so we have to save a frame and always be behind
static void* s_stored_frame = nullptr; static void* s_stored_frame = nullptr;
static u64 s_stored_frame_size = 0; static u64 s_stored_frame_size = 0;
bool b_start_dumping = false; static bool s_start_dumping = false;
bool AVIDump::Start(HWND hWnd, int w, int h) bool AVIDump::Start(HWND hWnd, int w, int h)
{ {
@ -171,7 +171,7 @@ void AVIDump::Stop()
// store one copy of the last video frame, CFR case // store one copy of the last video frame, CFR case
if (s_stream_compressed) if (s_stream_compressed)
AVIStreamWrite(s_stream_compressed, s_frame_count++, 1, GetFrame(), s_bitmap.biSizeImage, AVIIF_KEYFRAME, nullptr, &s_byte_buffer); AVIStreamWrite(s_stream_compressed, s_frame_count++, 1, GetFrame(), s_bitmap.biSizeImage, AVIIF_KEYFRAME, nullptr, &s_byte_buffer);
b_start_dumping = false; s_start_dumping = false;
CloseFile(); CloseFile();
s_file_count = 0; s_file_count = 0;
NOTICE_LOG(VIDEO, "Stop"); NOTICE_LOG(VIDEO, "Stop");
@ -228,10 +228,10 @@ void AVIDump::AddFrame(const u8* data, int w, int h)
u64 one_cfr = SystemTimers::GetTicksPerSecond() / VideoInterface::TargetRefreshRate; u64 one_cfr = SystemTimers::GetTicksPerSecond() / VideoInterface::TargetRefreshRate;
int nplay = 0; int nplay = 0;
s64 delta; s64 delta;
if (!b_start_dumping && s_last_frame <= SystemTimers::GetTicksPerSecond()) if (!s_start_dumping && s_last_frame <= SystemTimers::GetTicksPerSecond())
{ {
delta = CoreTiming::GetTicks(); delta = CoreTiming::GetTicks();
b_start_dumping = true; s_start_dumping = true;
} }
else else
{ {
@ -334,7 +334,7 @@ static int s_width;
static int s_height; static int s_height;
static int s_size; static int s_size;
static u64 s_last_frame; static u64 s_last_frame;
bool b_start_dumping = false; static bool s_start_dumping = false;
static u64 s_last_pts; static u64 s_last_pts;
static void InitAVCodec() static void InitAVCodec()
@ -446,11 +446,11 @@ void AVIDump::AddFrame(const u8* data, int width, int height)
int error = 0; int error = 0;
u64 delta; u64 delta;
s64 last_pts; s64 last_pts;
if (!b_start_dumping && s_last_frame <= SystemTimers::GetTicksPerSecond()) if (!s_start_dumping && s_last_frame <= SystemTimers::GetTicksPerSecond())
{ {
delta = CoreTiming::GetTicks(); delta = CoreTiming::GetTicks();
last_pts = AV_NOPTS_VALUE; last_pts = AV_NOPTS_VALUE;
b_start_dumping = true; s_start_dumping = true;
} }
else else
{ {