From 92949bc9658c398eba8df3c4fb2f5a3a89d4438e Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Thu, 22 Dec 2011 21:17:30 +0000 Subject: [PATCH] Remove AegisubApp::Get, as wxGetApp() does the same thing Originally committed to SVN as r6051. --- aegisub/src/audio_provider.cpp | 2 +- aegisub/src/ffmpegsource_common.cpp | 2 +- aegisub/src/frame_main.cpp | 2 +- aegisub/src/main.h | 2 -- aegisub/src/subtitles_provider_libass.cpp | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/aegisub/src/audio_provider.cpp b/aegisub/src/audio_provider.cpp index 686c10c9c..2cd989704 100644 --- a/aegisub/src/audio_provider.cpp +++ b/aegisub/src/audio_provider.cpp @@ -163,7 +163,7 @@ AudioProvider *AudioProviderFactory::GetProvider(wxString filename, int cache) { return provider; } - DialogProgress progress(AegisubApp::Get()->frame, _("Load audio")); + DialogProgress progress(wxGetApp().frame, _("Load audio")); // Convert to RAM if (cache == 1) return new RAMAudioProvider(provider, &progress); diff --git a/aegisub/src/ffmpegsource_common.cpp b/aegisub/src/ffmpegsource_common.cpp index 4077c0cd6..a96cde82e 100644 --- a/aegisub/src/ffmpegsource_common.cpp +++ b/aegisub/src/ffmpegsource_common.cpp @@ -94,7 +94,7 @@ FFMS_Index *FFmpegSourceProvider::DoIndexing(FFMS_Indexer *Indexer, const wxStri wxString MsgString; // set up progress dialog callback - DialogProgress Progress(AegisubApp::Get()->frame, _("Indexing"), _("Reading timecodes and frame/sample data")); + DialogProgress Progress(wxGetApp().frame, _("Indexing"), _("Reading timecodes and frame/sample data")); // index all audio tracks FFMS_Index *Index; diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp index 4cf0d0aab..76ebafd0d 100644 --- a/aegisub/src/frame_main.cpp +++ b/aegisub/src/frame_main.cpp @@ -148,7 +148,7 @@ FrameMain::FrameMain (wxArrayString args) StartupLog("Initializing context frames"); context->parent = this; context->previousFocus = 0; - AegisubApp::Get()->frame = this; + wxGetApp().frame = this; #ifdef __WXMAC__ // Bind(FrameMain::OnAbout, &FrameMain::cmd_call, this, cmd::id("app/about")); diff --git a/aegisub/src/main.h b/aegisub/src/main.h index 74c7cafe0..57f5a79a8 100644 --- a/aegisub/src/main.h +++ b/aegisub/src/main.h @@ -128,8 +128,6 @@ public: /// DOCME Automation4::AutoloadScriptManager *global_scripts; - static AegisubApp* Get() { return (AegisubApp*)wxTheApp; } - #ifdef __WXMAC__ // Apple events virtual void MacOpenFile(const wxString &filename); diff --git a/aegisub/src/subtitles_provider_libass.cpp b/aegisub/src/subtitles_provider_libass.cpp index 96b3d7a26..442724548 100644 --- a/aegisub/src/subtitles_provider_libass.cpp +++ b/aegisub/src/subtitles_provider_libass.cpp @@ -130,7 +130,7 @@ static void do_wait(agi::ProgressSink *ps, FontConfigCacheThread const * const * static void wait_for_cache_thread(FontConfigCacheThread const * const * const cache_worker) { if (!*cache_worker) return; - DialogProgress progress(AegisubApp::Get()->frame, "Updating font index", "This may take several minutes"); + DialogProgress progress(wxGetApp().frame, "Updating font index", "This may take several minutes"); progress.Run(bind(do_wait, std::tr1::placeholders::_1, cache_worker)); }