diff options
| author | Tillmann Karras <tilkax@gmail.com> | 2014-11-02 04:51:44 +0100 |
|---|---|---|
| committer | Tillmann Karras <tilkax@gmail.com> | 2014-11-02 04:51:44 +0100 |
| commit | ff41dd479bbc1c45395d8dfd649ab5b249252fdd (patch) | |
| tree | d26f4baf890a5589c8a916a9d9f9d9c461c8a00d /Source | |
| parent | f4fed0dea0e34a4520ef74ca64660a54a8d972fd (diff) | |
Fix warnings about non-static variables
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/DolphinWX/MainNoGUI.cpp | 6 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/AVIDump.cpp | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/Source/Core/DolphinWX/MainNoGUI.cpp b/Source/Core/DolphinWX/MainNoGUI.cpp index ebe1d97c30..fe6b54256b 100644 --- a/Source/Core/DolphinWX/MainNoGUI.cpp +++ b/Source/Core/DolphinWX/MainNoGUI.cpp @@ -55,10 +55,10 @@ void Host_Message(int Id) } } -void* windowHandle; +static void* s_window_handle; void* Host_GetRenderHandle() { - return windowHandle; + return s_window_handle; } void Host_UpdateTitle(const std::string& title) @@ -157,7 +157,7 @@ class PlatformX11 : public Platform XSetWMProtocols(dpy, win, wmProtocols, 1); XMapRaised(dpy, win); XFlush(dpy); - windowHandle = (void *) win; + s_window_handle = (void*) win; if (SConfig::GetInstance().m_LocalCoreStartupParameter.bDisableScreenSaver) X11Utils::InhibitScreensaver(dpy, win, true); diff --git a/Source/Core/VideoCommon/AVIDump.cpp b/Source/Core/VideoCommon/AVIDump.cpp index b0fc0da331..3a291c9353 100644 --- a/Source/Core/VideoCommon/AVIDump.cpp +++ b/Source/Core/VideoCommon/AVIDump.cpp @@ -51,7 +51,7 @@ static BITMAPINFOHEADER s_bitmap; // so we have to save a frame and always be behind static void* s_stored_frame = nullptr; 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) { @@ -171,7 +171,7 @@ void AVIDump::Stop() // store one copy of the last video frame, CFR case if (s_stream_compressed) 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(); s_file_count = 0; 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; int nplay = 0; s64 delta; - if (!b_start_dumping && s_last_frame <= SystemTimers::GetTicksPerSecond()) + if (!s_start_dumping && s_last_frame <= SystemTimers::GetTicksPerSecond()) { delta = CoreTiming::GetTicks(); - b_start_dumping = true; + s_start_dumping = true; } else { @@ -334,7 +334,7 @@ static int s_width; static int s_height; static int s_size; static u64 s_last_frame; -bool b_start_dumping = false; +static bool s_start_dumping = false; static u64 s_last_pts; static void InitAVCodec() @@ -446,11 +446,11 @@ void AVIDump::AddFrame(const u8* data, int width, int height) int error = 0; u64 delta; s64 last_pts; - if (!b_start_dumping && s_last_frame <= SystemTimers::GetTicksPerSecond()) + if (!s_start_dumping && s_last_frame <= SystemTimers::GetTicksPerSecond()) { delta = CoreTiming::GetTicks(); last_pts = AV_NOPTS_VALUE; - b_start_dumping = true; + s_start_dumping = true; } else { |