From e8b8f876bdcdd309f562ab6598fb0da1af99ec09 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Fri, 21 Jan 2011 04:57:21 +0000 Subject: [PATCH] Eliminate some uses of VideoContext::Get() Originally committed to SVN as r5254. --- aegisub/src/dialog_detached_video.cpp | 2 +- aegisub/src/dialog_resample.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aegisub/src/dialog_detached_video.cpp b/aegisub/src/dialog_detached_video.cpp index 3e0907384..3c618289b 100644 --- a/aegisub/src/dialog_detached_video.cpp +++ b/aegisub/src/dialog_detached_video.cpp @@ -69,7 +69,7 @@ DialogDetachedVideo::DialogDetachedVideo(FrameMain *parent, agi::Context *contex SetExtraStyle((GetExtraStyle() & ~wxWS_EX_BLOCK_EVENTS) | wxWS_EX_PROCESS_UI_UPDATES); // Set title - wxFileName fn(VideoContext::Get()->videoName); + wxFileName fn(context->videoController->videoName); SetTitle(wxString::Format(_("Video: %s"),fn.GetFullName().c_str())); // Set a background panel diff --git a/aegisub/src/dialog_resample.cpp b/aegisub/src/dialog_resample.cpp index 4fed1f3bb..cc4f3178b 100644 --- a/aegisub/src/dialog_resample.cpp +++ b/aegisub/src/dialog_resample.cpp @@ -103,7 +103,7 @@ DialogResample::DialogResample(agi::Context *c) ResY = new wxTextCtrl(this,-1,"",wxDefaultPosition,wxSize(50,-1),0,NumValidator(wxString::Format("%i",sh))); wxStaticText *ResText = new wxStaticText(this,-1,_("x")); wxButton *FromVideo = new wxButton(this,BUTTON_DEST_FROM_VIDEO,_("From video")); - if (!VideoContext::Get()->IsLoaded()) FromVideo->Enable(false); + if (!c->videoController->IsLoaded()) FromVideo->Enable(false); ResSizer->Add(ResX,1,wxRIGHT,5); ResSizer->Add(ResText,0,wxALIGN_CENTER | wxRIGHT,5); ResSizer->Add(ResY,1,wxRIGHT,5); @@ -331,8 +331,8 @@ void DialogResample::OnResample (wxCommandEvent &event) { /// @param event /// void DialogResample::OnGetDestRes (wxCommandEvent &event) { - ResX->SetValue(wxString::Format(_T("%i"),VideoContext::Get()->GetWidth())); - ResY->SetValue(wxString::Format(_T("%i"),VideoContext::Get()->GetHeight())); + ResX->SetValue(wxString::Format(_T("%i"),c->videoController->GetWidth())); + ResY->SetValue(wxString::Format(_T("%i"),c->videoController->GetHeight())); }