diff --git a/Source/Core/DolphinWX/FrameAui.cpp b/Source/Core/DolphinWX/FrameAui.cpp index 5ac605e101..d48476eee4 100644 --- a/Source/Core/DolphinWX/FrameAui.cpp +++ b/Source/Core/DolphinWX/FrameAui.cpp @@ -131,7 +131,7 @@ void CFrame::ToggleLogConfigWindow(bool bShow) if (bShow) { if (!m_LogConfigWindow) - m_LogConfigWindow = new LogConfigWindow(this, m_LogWindow, IDM_LOG_CONFIG_WINDOW); + m_LogConfigWindow = new LogConfigWindow(this, IDM_LOG_CONFIG_WINDOW); const int nbIndex = IDM_LOG_CONFIG_WINDOW - IDM_LOG_WINDOW; DoAddPage(m_LogConfigWindow, diff --git a/Source/Core/DolphinWX/LogConfigWindow.cpp b/Source/Core/DolphinWX/LogConfigWindow.cpp index 423804ecb8..a8761daa59 100644 --- a/Source/Core/DolphinWX/LogConfigWindow.cpp +++ b/Source/Core/DolphinWX/LogConfigWindow.cpp @@ -20,9 +20,9 @@ #include "DolphinWX/LogWindow.h" #include "DolphinWX/WxUtils.h" -LogConfigWindow::LogConfigWindow(wxWindow* parent, CLogWindow *log_window, wxWindowID id) +LogConfigWindow::LogConfigWindow(wxWindow* parent, wxWindowID id) : wxPanel(parent, id, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL, _("Log Configuration")) - , m_LogWindow(log_window), enableAll(true) + , enableAll(true) { SetMinSize(wxSize(100, 100)); m_LogManager = LogManager::GetInstance(); diff --git a/Source/Core/DolphinWX/LogConfigWindow.h b/Source/Core/DolphinWX/LogConfigWindow.h index e54a7dd2f6..a2ec418f3d 100644 --- a/Source/Core/DolphinWX/LogConfigWindow.h +++ b/Source/Core/DolphinWX/LogConfigWindow.h @@ -7,7 +7,6 @@ #include class LogManager; -class CLogWindow; class wxCheckBox; class wxCheckListBox; class wxRadioBox; @@ -15,7 +14,7 @@ class wxRadioBox; class LogConfigWindow : public wxPanel { public: - LogConfigWindow(wxWindow* parent, CLogWindow *log_window, wxWindowID id = wxID_ANY); + LogConfigWindow(wxWindow* parent, wxWindowID id = wxID_ANY); ~LogConfigWindow(); void SaveSettings(); @@ -23,7 +22,6 @@ public: private: LogManager *m_LogManager; - CLogWindow *m_LogWindow; bool m_writeFile, m_writeConsole, m_writeWindow; bool enableAll; diff --git a/Source/Core/VideoCommon/AVIDump.cpp b/Source/Core/VideoCommon/AVIDump.cpp index 28292ea9c5..d31900afe8 100644 --- a/Source/Core/VideoCommon/AVIDump.cpp +++ b/Source/Core/VideoCommon/AVIDump.cpp @@ -35,7 +35,7 @@ static AVFormatContext* s_format_context = nullptr; static AVStream* s_stream = nullptr; static AVFrame* s_src_frame = nullptr; static AVFrame* s_scaled_frame = nullptr; -AVPixelFormat s_pix_fmt = AV_PIX_FMT_BGR24; +static AVPixelFormat s_pix_fmt = AV_PIX_FMT_BGR24; static uint8_t* s_yuv_buffer = nullptr; static SwsContext* s_sws_context = nullptr; static int s_width;