mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Remove AegisubApp::Get, as wxGetApp() does the same thing

Browse source 
Originally committed to SVN as r6051.
This commit is contained in:
Thomas Goyne 2011-12-22 21:17:30 +00:00
parent 3e539835b7
commit 92949bc965
5 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
aegisub/src/audio_provider.cpp
View file

@ -163,7 +163,7 @@ AudioProvider *AudioProviderFactory::GetProvider(wxString filename, int cache) {
return provider; return provider;
} }
DialogProgress progress(AegisubApp::Get()->frame, _("Load audio")); DialogProgress progress(wxGetApp().frame, _("Load audio"));
// Convert to RAM // Convert to RAM
if (cache == 1) return new RAMAudioProvider(provider, &progress); if (cache == 1) return new RAMAudioProvider(provider, &progress);

2
aegisub/src/ffmpegsource_common.cpp
View file

@ -94,7 +94,7 @@ FFMS_Index *FFmpegSourceProvider::DoIndexing(FFMS_Indexer *Indexer, const wxStri
wxString MsgString; wxString MsgString;
// set up progress dialog callback // 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 // index all audio tracks
FFMS_Index *Index; FFMS_Index *Index;

2
aegisub/src/frame_main.cpp
View file

@ -148,7 +148,7 @@ FrameMain::FrameMain (wxArrayString args)
StartupLog("Initializing context frames"); StartupLog("Initializing context frames");
context->parent = this; context->parent = this;
context->previousFocus = 0; context->previousFocus = 0;
AegisubApp::Get()->frame = this; wxGetApp().frame = this;
#ifdef __WXMAC__ #ifdef __WXMAC__
// Bind(FrameMain::OnAbout, &FrameMain::cmd_call, this, cmd::id("app/about")); // Bind(FrameMain::OnAbout, &FrameMain::cmd_call, this, cmd::id("app/about"));

2
aegisub/src/main.h
View file

@ -128,8 +128,6 @@ public:
/// DOCME /// DOCME
Automation4::AutoloadScriptManager *global_scripts; Automation4::AutoloadScriptManager *global_scripts;
static AegisubApp* Get() { return (AegisubApp*)wxTheApp; }
#ifdef __WXMAC__ #ifdef __WXMAC__
// Apple events // Apple events
virtual void MacOpenFile(const wxString &filename); virtual void MacOpenFile(const wxString &filename);

2
aegisub/src/subtitles_provider_libass.cpp
View file

@ -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) { static void wait_for_cache_thread(FontConfigCacheThread const * const * const cache_worker) {
if (!*cache_worker) return; 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)); progress.Run(bind(do_wait, std::tr1::placeholders::_1, cache_worker));
} }