From 43f35020437dac24d20cf688ee1e90a7e5993dbc Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Wed, 16 Jun 2010 06:20:27 +0000 Subject: [PATCH] Eliminate double inclusion of frame_main.h and remove #pragma once Originally committed to SVN as r4526. --- aegisub/src/audio_player_alsa.cpp | 2 +- aegisub/src/audio_player_alsa.h | 1 - aegisub/src/audio_player_dsound.h | 1 - aegisub/src/audio_player_openal.h | 1 - aegisub/src/audio_player_oss.h | 2 - aegisub/src/frame_main.cpp | 87 +---- aegisub/src/frame_main.h | 266 +------------ aegisub/src/frame_main_events.cpp | 625 +++++------------------------- 8 files changed, 111 insertions(+), 874 deletions(-) diff --git a/aegisub/src/audio_player_alsa.cpp b/aegisub/src/audio_player_alsa.cpp index f96d30696..4e2c01ffa 100644 --- a/aegisub/src/audio_player_alsa.cpp +++ b/aegisub/src/audio_player_alsa.cpp @@ -185,7 +185,7 @@ void AlsaPlayer::SetUpHardware() if (snd_pcm_hw_params_set_period_time_near(pcm_handle, hwparams, &period_len, &dir) < 0) { throw _T("ALSA player: Couldn't set period length"); } - LOG_D_IF(period_len != wanted_period, "player/audio/alsa") << Couldn't get wanted period size of " << wanted_period" << ", got " << period_len << " instead"; + LOG_D_IF(period_len != wanted_period, "player/audio/alsa") << "Couldn't get wanted period size of " << wanted_period << ", got " << period_len << " instead"; if (snd_pcm_hw_params_get_period_size(hwparams, &period, &dir) < 0) { LOG_E("player/audio/alsa") << "Couldn't get period size"; diff --git a/aegisub/src/audio_player_alsa.h b/aegisub/src/audio_player_alsa.h index 5b4bc8e3e..e4f2ba5be 100644 --- a/aegisub/src/audio_player_alsa.h +++ b/aegisub/src/audio_player_alsa.h @@ -42,7 +42,6 @@ // Headers #include -#include "frame_main.h" #include "include/aegisub/audio_player.h" #include "include/aegisub/audio_provider.h" #include "options.h" diff --git a/aegisub/src/audio_player_dsound.h b/aegisub/src/audio_player_dsound.h index 0547b8140..f10884887 100644 --- a/aegisub/src/audio_player_dsound.h +++ b/aegisub/src/audio_player_dsound.h @@ -45,7 +45,6 @@ #include -#include "frame_main.h" #include "include/aegisub/audio_player.h" #include "include/aegisub/audio_provider.h" #include "utils.h" diff --git a/aegisub/src/audio_player_openal.h b/aegisub/src/audio_player_openal.h index d40d5c047..8ecbc3388 100644 --- a/aegisub/src/audio_player_openal.h +++ b/aegisub/src/audio_player_openal.h @@ -41,7 +41,6 @@ /////////// // Headers #include "audio_player_manager.h" -#include "frame_main.h" #include "include/aegisub/audio_player.h" #include "include/aegisub/audio_provider.h" #include "options.h" diff --git a/aegisub/src/audio_player_oss.h b/aegisub/src/audio_player_oss.h index f12e70db5..96e97d0ba 100644 --- a/aegisub/src/audio_player_oss.h +++ b/aegisub/src/audio_player_oss.h @@ -54,8 +54,6 @@ # endif #endif - -#include "frame_main.h" #include "include/aegisub/audio_player.h" #include "include/aegisub/audio_provider.h" #include "options.h" diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp index 194f7546e..93f82a403 100644 --- a/aegisub/src/frame_main.cpp +++ b/aegisub/src/frame_main.cpp @@ -32,11 +32,7 @@ /// @file frame_main.cpp /// @brief Main window creation and control management /// @ingroup main_ui -/// - -/////////////////// -// Include headers #include "config.h" #ifndef AGI_PRE @@ -102,13 +98,6 @@ #define StartupLog(a) #endif -///////////////////////// -// FrameMain constructor - - -/// @brief DOCME -/// @param args -/// FrameMain::FrameMain (wxArrayString args) : wxFrame ((wxFrame*)NULL,-1,_T(""),wxDefaultPosition,wxSize(920,700),wxDEFAULT_FRAME_STYLE | wxCLIP_CHILDREN) { @@ -228,10 +217,7 @@ FrameMain::FrameMain (wxArrayString args) StartupLog(_T("Leaving FrameMain constructor")); } - - /// @brief FrameMain destructor -/// FrameMain::~FrameMain () { DeInitContents(); #ifdef WITH_AUTOMATION @@ -239,10 +225,7 @@ FrameMain::~FrameMain () { #endif } - - /// @brief Initialize toolbar -/// void FrameMain::InitToolbar () { // Create toolbar wxSystemOptions::SetOption(_T("msw.remap"), 0); @@ -319,14 +302,12 @@ void FrameMain::InitToolbar () { /// @param item_text /// @param hotkey_name /// @return -/// wxString MakeHotkeyText(const wxString &item_text, const wxString &hotkey_name) { return item_text + wxString(_T("\t")) + Hotkeys.GetText(hotkey_name); } /// @brief Initialize menu bar -/// void FrameMain::InitMenu() { // Deinit menu if needed if (menuCreated) { @@ -580,10 +561,7 @@ void FrameMain::InitMenu() { menuCreated = true; } - - /// @brief Initialize contents -/// void FrameMain::InitContents() { // Set a background panel StartupLog(_T("Create background panel")); @@ -646,10 +624,7 @@ void FrameMain::InitContents() { StartupLog(_T("Leaving InitContents")); } - - /// @brief Deinitialize controls -/// void FrameMain::DeInitContents() { if (detachedVideo) detachedVideo->Destroy(); if (stylingAssistant) stylingAssistant->Destroy(); @@ -660,10 +635,7 @@ void FrameMain::DeInitContents() { HelpButton::ClearPages(); } - - /// @brief Update toolbar -/// void FrameMain::UpdateToolbar() { // Collect flags bool isVideo = VideoContext::Get()->IsLoaded(); @@ -686,13 +658,9 @@ void FrameMain::UpdateToolbar() { toolbar->Realize(); } - - /// @brief Open subtitles /// @param filename /// @param charset -/// @return -/// void FrameMain::LoadSubtitles (wxString filename,wxString charset) { // First check if there is some loaded if (AssFile::top && AssFile::top->loaded) { @@ -781,13 +749,10 @@ void FrameMain::LoadSubtitles (wxString filename,wxString charset) { UpdateTitle(); } - - /// @brief Save subtitles /// @param saveas /// @param withCharset /// @return -/// bool FrameMain::SaveSubtitles(bool saveas,bool withCharset) { // Try to get filename from file wxString filename; @@ -838,12 +803,9 @@ bool FrameMain::SaveSubtitles(bool saveas,bool withCharset) { return false; } - - /// @brief Try to close subtitles /// @param enableCancel /// @return -/// int FrameMain::TryToCloseSubs(bool enableCancel) { AssFile *ass = AssFile::top; if (ass->IsModified()) { @@ -860,8 +822,6 @@ int FrameMain::TryToCloseSubs(bool enableCancel) { else return wxYES; } - - /// @brief Set the video and audio display visibilty /// @param video -1: leave unchanged; 0: hide; 1: show /// @param audio -1: leave unchanged; 0: hide; 1: show @@ -902,10 +862,7 @@ void FrameMain::SetDisplayMode(int video, int audio) { Thaw(); } - - /// @brief Update title bar -/// void FrameMain::UpdateTitle() { // Determine if current subs are modified bool subsMod = AssFile::top->IsModified(); @@ -942,11 +899,8 @@ void FrameMain::UpdateTitle() { if (curTitle != newTitle) SetTitle(newTitle); } - - /// @brief Updates subs with video/whatever data /// @param fromSubs -/// void FrameMain::SynchronizeProject(bool fromSubs) { // Gather current data AssFile *subs = AssFile::top; @@ -1130,13 +1084,9 @@ void FrameMain::SynchronizeProject(bool fromSubs) { } } - - /// @brief Loads video /// @param file /// @param autoload -/// @return -/// void FrameMain::LoadVideo(wxString file,bool autoload) { if (blockVideoLoad) return; Freeze(); @@ -1210,13 +1160,9 @@ void FrameMain::LoadVideo(wxString file,bool autoload) { Thaw(); } - - /// @brief Loads audio /// @param filename /// @param FromVideo -/// @return -/// void FrameMain::LoadAudio(wxString filename,bool FromVideo) { if (blockAudioLoad) return; VideoContext::Get()->Stop(); @@ -1239,11 +1185,8 @@ void FrameMain::LoadAudio(wxString filename,bool FromVideo) { } } - - /// @brief Loads VFR /// @param filename -/// void FrameMain::LoadVFR(wxString filename) { VideoContext::Get()->Stop(); if (filename != _T("")) { @@ -1273,26 +1216,17 @@ void FrameMain::LoadVFR(wxString filename) { EditBox->UpdateFrameTiming(); } - - /// @brief Saves VFR /// @param filename -/// void FrameMain::SaveVFR(wxString filename) { VFR_Output.Save(filename); } - - /// @brief Open help -/// @param page -/// -void FrameMain::OpenHelp(wxString page) { +void FrameMain::OpenHelp(wxString) { HelpButton::OpenPage(_T("Main")); } - - /// @brief Detach video window /// @param detach void FrameMain::DetachVideo(bool detach) { @@ -1311,22 +1245,16 @@ void FrameMain::DetachVideo(bool detach) { UpdateToolbar(); } - - -/// @brief Sets status and clear after n miliseconds +/// @brief Sets status and clear after n milliseconds /// @param text /// @param ms -/// void FrameMain::StatusTimeout(wxString text,int ms) { SetStatusText(text,1); StatusClear.SetOwner(this,StatusClear_Timer); StatusClear.Start(ms,true); } - - /// @brief Setup accelerator table -/// void FrameMain::SetAccelerators() { std::vector entry; entry.reserve(32); @@ -1364,12 +1292,9 @@ void FrameMain::SetAccelerators() { SetAcceleratorTable(table); } - - /// @brief Load list of files /// @param list /// @return -/// bool FrameMain::LoadList(wxArrayString list) { // Build list wxArrayString List; @@ -1455,19 +1380,13 @@ bool FrameMain::LoadList(wxArrayString list) { } - - /// @brief Sets the descriptions for undo/redo -/// void FrameMain::SetUndoRedoDesc() { editMenu->SetHelpString(0,_T("Undo ")+AssFile::GetUndoDescription()); editMenu->SetHelpString(1,_T("Redo ")+AssFile::GetRedoDescription()); } - - /// @brief Check if ASSDraw is available -/// bool FrameMain::HasASSDraw() { #ifdef __WINDOWS__ wxFileName fn(StandardPaths::DecodePath(_T("?data/ASSDraw3.exe"))); @@ -1476,5 +1395,3 @@ bool FrameMain::HasASSDraw() { return false; #endif } - - diff --git a/aegisub/src/frame_main.h b/aegisub/src/frame_main.h index 35921e679..936a9b8dd 100644 --- a/aegisub/src/frame_main.h +++ b/aegisub/src/frame_main.h @@ -34,12 +34,6 @@ /// @ingroup main_ui /// - -#pragma once - - -/////////////////// -// Include headers #ifndef AGI_PRE #include @@ -53,8 +47,6 @@ #endif -//////////////////// -// Class prototypes class VideoDisplay; class VideoSlider; class VideoZoomSlider; @@ -66,8 +58,7 @@ class DialogDetachedVideo; class DialogStyling; class AegisubFileDropTarget; -/// DOCME -namespace Automation4 { class FeatureMacro; class ScriptManager; }; +namespace Automation4 { class FeatureMacro; class ScriptManager; } @@ -386,410 +377,157 @@ public: }; -//////////////// -// Menu Entries +/// Menu entry event ids enum { - - /// DOCME Menu_File_New = 200, - - /// DOCME Menu_File_Open, - - /// DOCME Menu_File_Save, - - /// DOCME Menu_File_SaveAs, - - /// DOCME Menu_File_Close, - - /// DOCME Menu_File_Open_Video, - - /// DOCME Menu_File_Close_Video, - - /// DOCME Menu_File_Open_Subtitles, - - /// DOCME Menu_File_Open_Subtitles_Charset, Menu_File_Open_Subtitles_From_Video, - - /// DOCME Menu_File_New_Subtitles, - - /// DOCME Menu_File_Save_Subtitles, - - /// DOCME Menu_File_Save_Subtitles_As, - - /// DOCME Menu_File_Save_Subtitles_With_Charset, - - /// DOCME Menu_File_Export_Subtitles, - - /// DOCME Menu_File_Open_VFR, - - /// DOCME Menu_File_Save_VFR, - - /// DOCME Menu_File_Close_VFR, - - /// DOCME Menu_File_New_Window, - - /// DOCME Menu_File_Exit, - - /// DOCME Menu_File_Recent_Subs_Parent, - - /// DOCME Menu_File_Recent_Vids_Parent, - - /// DOCME Menu_File_Recent_Auds_Parent, - - /// DOCME Menu_File_Recent_Timecodes_Parent, - - /// DOCME Menu_File_Recent_Keyframes_Parent, - - /// DOCME Menu_Video_JumpTo, - - /// DOCME Menu_View_Zoom, - - /// DOCME Menu_View_Zoom_50, - - /// DOCME Menu_View_Zoom_100, - - /// DOCME Menu_View_Zoom_200, - - /// DOCME Menu_Video_Zoom_In, - - /// DOCME Menu_Video_Zoom_Out, - - /// DOCME Menu_Video_Load_Keyframes, - - /// DOCME Menu_Video_Save_Keyframes, - - /// DOCME Menu_Video_Close_Keyframes, - - /// DOCME Toolbar_Zoom_Dropdown, - - /// DOCME Menu_Video_AR, - - /// DOCME Menu_Video_AR_Default, - - /// DOCME Menu_Video_AR_Full, - - /// DOCME Menu_Video_AR_Wide, - - /// DOCME Menu_Video_AR_235, - - /// DOCME Menu_Video_AR_Custom, - - /// DOCME Menu_Video_Select_Visible, - - /// DOCME Menu_Video_Play, - - /// DOCME Menu_Video_Detach, - - /// DOCME Menu_Video_Dummy, - - /// DOCME Menu_Video_Overscan, - - /// DOCME Menu_Video_Details, - - /// DOCME Menu_Audio_Open_File, - - /// DOCME Menu_Audio_Open_From_Video, - - /// DOCME Menu_Audio_Close, #ifdef _DEBUG - - /// DOCME Menu_Audio_Open_Dummy, - - /// DOCME Menu_Audio_Open_Dummy_Noise, #endif - - /// DOCME Menu_Edit_Select, - - /// DOCME Menu_Edit_Undo, - - /// DOCME Menu_Edit_Redo, - - /// DOCME Menu_Edit_Find, - - /// DOCME Menu_Edit_Find_Next, - - /// DOCME Menu_Edit_Replace, - - /// DOCME Menu_Edit_Shift, - - /// DOCME Menu_Edit_Cut, - - /// DOCME Menu_Edit_Copy, - - /// DOCME Menu_Edit_Paste, - - /// DOCME Menu_Edit_Paste_Over, - - /// DOCME Menu_Edit_Delete, - - /// DOCME Menu_View_Language, - - /// DOCME Menu_View_Standard, - - /// DOCME Menu_View_Audio, - - /// DOCME Menu_View_Video, - - /// DOCME Menu_View_Subs, Menu_View_FullTags, Menu_View_ShortTags, Menu_View_NoTags, - - /// DOCME Menu_Subtitles_Join, - - /// DOCME Menu_Subtitles_Recombine, - - /// DOCME Menu_Subtitles_Insert, Menu_Subtitles_Sort_Start, Menu_Subtitles_Sort_End, Menu_Subtitles_Sort_Style, - - - /// DOCME Menu_Tools_Properties, - - /// DOCME Menu_Tools_Styles_Manager, - - /// DOCME Menu_Tools_Attachments, - - /// DOCME Menu_Tools_Translation, - - /// DOCME Menu_Tools_SpellCheck, - - /// DOCME Menu_Tools_Fonts_Collector, - - /// DOCME Menu_Tools_Automation, - - /// DOCME Menu_Tools_Styling, - - /// DOCME Menu_Tools_Resample, - - /// DOCME Menu_Tools_Timing_Processor, - - /// DOCME Menu_Tools_Kanji_Timer, - - /// DOCME Menu_Tools_Options, - - /// DOCME Menu_Tools_ASSDraw, - - /// DOCME Menu_Help_Contents, - - /// DOCME Menu_Help_Files, - - /// DOCME Menu_Help_IRCChannel, - - /// DOCME Menu_Help_Website, - - /// DOCME Menu_Help_Forums, - - /// DOCME Menu_Help_BugTracker, - - /// DOCME Menu_Help_Check_Updates, - - /// DOCME Menu_Help_About, Menu_Help_Log, - - /// DOCME Menu_Subs_Snap_Start_To_Video, - - /// DOCME Menu_Subs_Snap_End_To_Video, - - /// DOCME Menu_Subs_Snap_Video_To_Start, - - /// DOCME Menu_Subs_Snap_Video_To_End, - - /// DOCME Menu_Video_Snap_To_Scene, - - /// DOCME Menu_Video_Shift_To_Frame, - - /// DOCME AutoSave_Timer, - - /// DOCME StatusClear_Timer, - - /// DOCME Video_Next_Frame, - - /// DOCME Video_Prev_Frame, - - /// DOCME Video_Focus_Seek, - - /// DOCME Grid_Next_Line, - - /// DOCME Grid_Prev_Line, - - /// DOCME Grid_Toggle_Tags, - /// DOCME Edit_Box_Commit, - - /// DOCME Video_Frame_Play, - - /// DOCME Medusa_Play, - - /// DOCME Medusa_Stop, - - /// DOCME Medusa_Shift_Start_Forward, - - /// DOCME Medusa_Shift_Start_Back, - - /// DOCME Medusa_Shift_End_Forward, - - /// DOCME Medusa_Shift_End_Back, - - /// DOCME Medusa_Play_Before, - - /// DOCME Medusa_Play_After, - - /// DOCME Medusa_Next, - - /// DOCME Medusa_Prev, - - /// DOCME Medusa_Enter, - - /// DOCME Menu_File_Recent = 2000, - - /// DOCME Menu_Video_Recent = 2200, - - /// DOCME Menu_Audio_Recent = 2400, - - /// DOCME Menu_Timecodes_Recent = 2500, - - /// DOCME Menu_Keyframes_Recent = 2600, - - /// DOCME Menu_Automation_Macro = 2700 }; diff --git a/aegisub/src/frame_main_events.cpp b/aegisub/src/frame_main_events.cpp index 98d5f9377..84711b276 100644 --- a/aegisub/src/frame_main_events.cpp +++ b/aegisub/src/frame_main_events.cpp @@ -32,11 +32,9 @@ /// @file frame_main_events.cpp /// @brief Event handlers for controls in main window /// @ingroup main_ui -/// -/////////////////// -// Include headers +////////////////// Include headers #include "config.h" #ifndef AGI_PRE @@ -104,8 +102,6 @@ extern "C" { } #endif -//////////////////// -// Menu event table BEGIN_EVENT_TABLE(FrameMain, wxFrame) EVT_TIMER(AutoSave_Timer, FrameMain::OnAutoSave) EVT_TIMER(StatusClear_Timer, FrameMain::OnStatusClear) @@ -251,21 +247,16 @@ BEGIN_EVENT_TABLE(FrameMain, wxFrame) END_EVENT_TABLE() - /// @brief Redirect grid events to grid /// @param event -/// void FrameMain::OnGridEvent (wxCommandEvent &event) { SubsBox->GetEventHandler()->ProcessEvent(event); } - - /// @brief Rebuild recent list /// @param listName /// @param menu /// @param startID -/// void FrameMain::RebuildRecentList(wxString listName,wxMenu *menu,int startID) { // Wipe previous list int count = (int)menu->GetMenuItemCount(); @@ -290,11 +281,8 @@ void FrameMain::RebuildRecentList(wxString listName,wxMenu *menu,int startID) { if (added == 0) menu->Append(startID,_("Empty"))->Enable(false); } - - /// @brief Menu is being opened /// @param event -/// void FrameMain::OnMenuOpen (wxMenuEvent &event) { // Get menu MenuBar->Freeze(); @@ -504,13 +492,10 @@ void FrameMain::OnMenuOpen (wxMenuEvent &event) { MenuBar->Thaw(); } - - /// @brief Macro menu creation helper /// @param menu /// @param macros /// @return -/// int FrameMain::AddMacroMenuItems(wxMenu *menu, const std::vector ¯os) { #ifdef WITH_AUTOMATION if (macros.empty()) { @@ -531,41 +516,29 @@ int FrameMain::AddMacroMenuItems(wxMenu *menu, const std::vectormru->GetEntry("Subtitle", number))); } - - /// @brief Open recent video menu entry /// @param event -/// void FrameMain::OnOpenRecentVideo(wxCommandEvent &event) { int number = event.GetId()-Menu_Video_Recent; LoadVideo(lagi_wxString(AegisubApp::Get()->mru->GetEntry("Video", number))); } - - /// @brief Open recent timecodes entry /// @param event -/// void FrameMain::OnOpenRecentTimecodes(wxCommandEvent &event) { int number = event.GetId()-Menu_Timecodes_Recent; LoadVFR(lagi_wxString(AegisubApp::Get()->mru->GetEntry("Timecodes", number))); } - - /// @brief Open recent Keyframes entry /// @param event -/// void FrameMain::OnOpenRecentKeyframes(wxCommandEvent &event) { int number = event.GetId()-Menu_Keyframes_Recent; KeyFrameFile::Load(lagi_wxString(AegisubApp::Get()->mru->GetEntry("Keyframes", number))); @@ -574,74 +547,50 @@ void FrameMain::OnOpenRecentKeyframes(wxCommandEvent &event) { Refresh(); } - - /// @brief Open recent audio menu entry /// @param event -/// void FrameMain::OnOpenRecentAudio(wxCommandEvent &event) { int number = event.GetId()-Menu_Audio_Recent; LoadAudio(lagi_wxString(AegisubApp::Get()->mru->GetEntry("Audio", number))); } - - /// @brief Open new Window -/// @param event -/// -void FrameMain::OnNewWindow(wxCommandEvent& WXUNUSED(event)) { +void FrameMain::OnNewWindow(wxCommandEvent&) { RestartAegisub(); - //wxStandardPaths stand; - //wxExecute(stand.GetExecutablePath()); } - - /// @brief Exit -/// -void FrameMain::OnExit(wxCommandEvent& WXUNUSED(event)) { +void FrameMain::OnExit(wxCommandEvent&) { Close(); } - - /// @brief Open about box -/// @param event -/// -void FrameMain::OnAbout(wxCommandEvent &event) { +void FrameMain::OnAbout(wxCommandEvent &) { AboutScreen About(this); About.ShowModal(); } /// @brief Open log window -/// @param event -void FrameMain::OnLog(wxCommandEvent &event) { +void FrameMain::OnLog(wxCommandEvent &) { LogWindow *log = new LogWindow(this); log->Show(1); } /// @brief Open check updates -/// @param event -/// -void FrameMain::OnCheckUpdates(wxCommandEvent &event) { +void FrameMain::OnCheckUpdates(wxCommandEvent &) { PerformVersionCheck(true); } - - /// @brief Open help topics -/// @param event -/// -void FrameMain::OnContents(wxCommandEvent& WXUNUSED(event)) { +void FrameMain::OnContents(wxCommandEvent&) { OpenHelp(_T("")); } /// @brief Open help files on OSX. /// @param event -/// -void FrameMain::OnFiles(wxCommandEvent& WXUNUSED(event)) { +void FrameMain::OnFiles(wxCommandEvent&) { #ifdef __WXMAC__ char *shared_path = OSX_GetBundleSharedSupportDirectory(); wxString help_path = wxString::Format(_T("%s/doc"), wxString(shared_path, wxConvUTF8).c_str()); @@ -649,30 +598,18 @@ void FrameMain::OnFiles(wxCommandEvent& WXUNUSED(event)) { #endif } - - /// @brief Open website -/// @param event -/// -void FrameMain::OnWebsite(wxCommandEvent& WXUNUSED(event)) { +void FrameMain::OnWebsite(wxCommandEvent&) { AegisubApp::OpenURL(_T("http://www.aegisub.org/")); } - - /// @brief Open forums -/// @param event -/// -void FrameMain::OnForums(wxCommandEvent& WXUNUSED(event)) { +void FrameMain::OnForums(wxCommandEvent&) { AegisubApp::OpenURL(_T("http://forum.aegisub.org/")); } - - /// @brief Open bugtracker -/// @param event -/// -void FrameMain::OnBugTracker(wxCommandEvent& WXUNUSED(event)) { +void FrameMain::OnBugTracker(wxCommandEvent&) { if (wxGetMouseState().CmdDown()) { if (wxGetMouseState().ShiftDown()) { wxMessageBox(_T("Now crashing with an access violation...")); @@ -687,31 +624,19 @@ void FrameMain::OnBugTracker(wxCommandEvent& WXUNUSED(event)) { AegisubApp::OpenURL(_T("http://devel.aegisub.org/")); } - - /// @brief Open IRC channel -/// @param event -/// -void FrameMain::OnIRCChannel(wxCommandEvent& WXUNUSED(event)) { +void FrameMain::OnIRCChannel(wxCommandEvent&) { AegisubApp::OpenURL(_T("irc://irc.rizon.net/aegisub")); } - - /// @brief Play video -/// @param event -/// -void FrameMain::OnVideoPlay(wxCommandEvent &event) { +void FrameMain::OnVideoPlay(wxCommandEvent &) { VideoContext::Get()->Play(); } - - /// @brief Open video -/// @param event -/// -void FrameMain::OnOpenVideo(wxCommandEvent& WXUNUSED(event)) { +void FrameMain::OnOpenVideo(wxCommandEvent&) { wxString path = lagi_wxString(OPT_GET("Path/Last/Video")->GetString()); wxString str = wxString(_("Video Formats")) + _T(" (*.avi,*.mkv,*.mp4,*.avs,*.d2v,*.ogm,*.mpeg,*.mpg,*.vob,*.mov)|*.avi;*.avs;*.d2v;*.mkv;*.ogm;*.mp4;*.mpeg;*.mpg;*.vob;*.mov|") + _("All Files") + _T(" (*.*)|*.*"); @@ -722,21 +647,13 @@ void FrameMain::OnOpenVideo(wxCommandEvent& WXUNUSED(event)) { } } - - /// @brief Close video -/// @param event -/// -void FrameMain::OnCloseVideo(wxCommandEvent& WXUNUSED(event)) { +void FrameMain::OnCloseVideo(wxCommandEvent&) { LoadVideo(_T("")); } - - /// @brief Open Audio -/// @param event -/// -void FrameMain::OnOpenAudio (wxCommandEvent& WXUNUSED(event)) { +void FrameMain::OnOpenAudio (wxCommandEvent&) { wxString path = lagi_wxString(OPT_GET("Path/Last/Audio")->GetString()); wxString str = wxString(_("Audio Formats")) + _T(" (*.wav,*.mp3,*.ogg,*.flac,*.mp4,*.ac3,*.aac,*.mka,*.m4a,*.w64)|*.wav;*.mp3;*.ogg;*.flac;*.mp4;*.ac3;*.aac;*.mka;*.m4a;*.w64|") + _("Video Formats") + _T(" (*.avi,*.mkv,*.ogm,*.mpg,*.mpeg)|*.avi;*.mkv;*.ogm;*.mp4;*.mpeg;*.mpg|") @@ -748,37 +665,25 @@ void FrameMain::OnOpenAudio (wxCommandEvent& WXUNUSED(event)) { } } - - /// @brief DOCME -/// @param event -/// -void FrameMain::OnOpenAudioFromVideo (wxCommandEvent& WXUNUSED(event)) { +void FrameMain::OnOpenAudioFromVideo (wxCommandEvent&) { LoadAudio(_T(""),true); } - - /// @brief DOCME -/// @param event -/// -void FrameMain::OnCloseAudio (wxCommandEvent& WXUNUSED(event)) { +void FrameMain::OnCloseAudio (wxCommandEvent&) { LoadAudio(_T("")); } #ifdef _DEBUG /// @brief DOCME -/// @param event -/// -void FrameMain::OnOpenDummyAudio (wxCommandEvent& WXUNUSED(event)) { +void FrameMain::OnOpenDummyAudio (wxCommandEvent&) { LoadAudio(_T("?dummy")); } /// @brief DOCME -/// @param event -/// -void FrameMain::OnOpenDummyNoiseAudio (wxCommandEvent& WXUNUSED(event)) { +void FrameMain::OnOpenDummyNoiseAudio (wxCommandEvent&) { LoadAudio(_T("?noise")); } #endif @@ -786,9 +691,7 @@ void FrameMain::OnOpenDummyNoiseAudio (wxCommandEvent& WXUNUSED(event)) { /// @brief Open subtitles -/// @param event -/// -void FrameMain::OnOpenSubtitles(wxCommandEvent& WXUNUSED(event)) { +void FrameMain::OnOpenSubtitles(wxCommandEvent&) { wxString path = lagi_wxString(OPT_GET("Path/Last/Subtitles")->GetString()); wxString filename = wxFileSelector(_("Open subtitles file"),path,_T(""),_T(""),AssFile::GetWildcardList(0),wxFD_OPEN | wxFD_FILE_MUST_EXIST); if (!filename.empty()) { @@ -798,12 +701,8 @@ void FrameMain::OnOpenSubtitles(wxCommandEvent& WXUNUSED(event)) { } } - - /// @brief Open subtitles with specific charset -/// @param event -/// -void FrameMain::OnOpenSubtitlesCharset(wxCommandEvent& WXUNUSED(event)) { +void FrameMain::OnOpenSubtitlesCharset(wxCommandEvent&) { // Initialize charsets wxString path = lagi_wxString(OPT_GET("Path/Last/Subtitles")->GetString()); @@ -823,48 +722,28 @@ void FrameMain::OnOpenSubtitlesVideo(wxCommandEvent&) { LoadSubtitles(VideoContext::Get()->videoName, "binary"); } - - /// @brief Save subtitles as -/// @param event -/// -void FrameMain::OnSaveSubtitlesAs(wxCommandEvent& WXUNUSED(event)) { +void FrameMain::OnSaveSubtitlesAs(wxCommandEvent&) { SaveSubtitles(true); } - - /// @brief Save subtitles -/// @param event -/// -void FrameMain::OnSaveSubtitles(wxCommandEvent& WXUNUSED(event)) { +void FrameMain::OnSaveSubtitles(wxCommandEvent&) { SaveSubtitles(false); } - - /// @brief Save subtitles with specific charset -/// @param event -/// -void FrameMain::OnSaveSubtitlesCharset(wxCommandEvent& WXUNUSED(event)) { +void FrameMain::OnSaveSubtitlesCharset(wxCommandEvent&) { SaveSubtitles(true,true); } - - /// @brief Close subtitles -/// @param event -/// -void FrameMain::OnNewSubtitles(wxCommandEvent& WXUNUSED(event)) { +void FrameMain::OnNewSubtitles(wxCommandEvent&) { LoadSubtitles(_T("")); } - - /// @brief Export subtitles -/// @param event -/// -void FrameMain::OnExportSubtitles(wxCommandEvent & WXUNUSED(event)) { +void FrameMain::OnExportSubtitles(wxCommandEvent &) { #ifdef WITH_AUTOMATION int autoreload = OPT_GET("Automation/Autoreload Mode")->GetInt(); if (autoreload & 1) { @@ -892,12 +771,8 @@ void FrameMain::OnExportSubtitles(wxCommandEvent & WXUNUSED(event)) { exporter.ShowModal(); } - - /// @brief Open VFR tags -/// @param event -/// -void FrameMain::OnOpenVFR(wxCommandEvent &event) { +void FrameMain::OnOpenVFR(wxCommandEvent &) { wxString path = lagi_wxString(OPT_GET("Path/Last/Timecodes")->GetString()); wxString str = wxString(_("All Supported Types")) + _T("(*.txt)|*.txt|") + _("All Files") + _T(" (*.*)|*.*"); @@ -908,12 +783,8 @@ void FrameMain::OnOpenVFR(wxCommandEvent &event) { } } - - /// @brief Save VFR tags -/// @param event -/// -void FrameMain::OnSaveVFR(wxCommandEvent &event) { +void FrameMain::OnSaveVFR(wxCommandEvent &) { wxString path = lagi_wxString(OPT_GET("Path/Last/Timecodes")->GetString()); wxString str = wxString(_("All Supported Types")) + _T("(*.txt)|*.txt|") + _("All Files") + _T(" (*.*)|*.*"); @@ -925,22 +796,13 @@ void FrameMain::OnSaveVFR(wxCommandEvent &event) { } - - /// @brief Close VFR tags -/// @param event -/// -void FrameMain::OnCloseVFR(wxCommandEvent &event) { +void FrameMain::OnCloseVFR(wxCommandEvent &) { LoadVFR(_T("")); } - - /// @brief Open keyframes -/// @param event -/// @return -/// -void FrameMain::OnOpenKeyframes (wxCommandEvent &event) { +void FrameMain::OnOpenKeyframes (wxCommandEvent &) { // Pick file wxString path = lagi_wxString(OPT_GET("Path/Last/Keyframes")->GetString()); wxString filename = wxFileSelector(_T("Select the keyframes file to open"),path,_T(""),_T(".txt"),_T("All supported formats (*.txt, *.pass, *.stats, *.log)|*.txt;*.pass;*.stats;*.log|All files (*.*)|*.*"),wxFD_FILE_MUST_EXIST | wxFD_OPEN); @@ -954,25 +816,16 @@ void FrameMain::OnOpenKeyframes (wxCommandEvent &event) { Refresh(); } - - /// @brief Close keyframes -/// @param event -/// -void FrameMain::OnCloseKeyframes (wxCommandEvent &event) { +void FrameMain::OnCloseKeyframes (wxCommandEvent &) { VideoContext::Get()->CloseOverKeyFrames(); videoBox->videoSlider->Refresh(); audioBox->audioDisplay->Update(); Refresh(); } - - /// @brief Save keyframes -/// @param event -/// @return -/// -void FrameMain::OnSaveKeyframes (wxCommandEvent &event) { +void FrameMain::OnSaveKeyframes (wxCommandEvent &) { // Pick file wxString path = lagi_wxString(OPT_GET("Path/Last/Keyframes")->GetString()); wxString filename = wxFileSelector(_T("Select the Keyframes file to open"),path,_T(""),_T("*.key.txt"),_T("Text files (*.txt)|*.txt"),wxFD_OVERWRITE_PROMPT | wxFD_SAVE); @@ -983,109 +836,75 @@ void FrameMain::OnSaveKeyframes (wxCommandEvent &event) { KeyFrameFile::Save(filename); } - - /// @brief Zoom levels -/// @param event -/// -void FrameMain::OnSetZoom50(wxCommandEvent& WXUNUSED(event)) { +void FrameMain::OnSetZoom50(wxCommandEvent&) { VideoContext::Get()->Stop(); videoBox->videoDisplay->SetZoom(.5); } /// @brief DOCME -/// @param event -/// -void FrameMain::OnSetZoom100(wxCommandEvent& WXUNUSED(event)) { +void FrameMain::OnSetZoom100(wxCommandEvent&) { VideoContext::Get()->Stop(); videoBox->videoDisplay->SetZoom(1.); } /// @brief DOCME -/// @param event -/// -void FrameMain::OnSetZoom200(wxCommandEvent& WXUNUSED(event)) { +void FrameMain::OnSetZoom200(wxCommandEvent&) { VideoContext::Get()->Stop(); videoBox->videoDisplay->SetZoom(2.); } /// @brief DOCME -/// @param event -/// -void FrameMain::OnZoomIn (wxCommandEvent &event) { +void FrameMain::OnZoomIn (wxCommandEvent &) { VideoContext::Get()->Stop(); videoBox->videoDisplay->SetZoom(videoBox->videoDisplay->GetZoom() + .125); } /// @brief DOCME -/// @param event -/// -void FrameMain::OnZoomOut (wxCommandEvent &event) { +void FrameMain::OnZoomOut (wxCommandEvent &) { VideoContext::Get()->Stop(); videoBox->videoDisplay->SetZoom(videoBox->videoDisplay->GetZoom() - .125); } /// @brief DOCME -/// @param event -/// -void FrameMain::OnSetZoom(wxCommandEvent &event) { +void FrameMain::OnSetZoom(wxCommandEvent &) { videoBox->videoDisplay->SetZoomFromBox(); } - - /// @brief Detach video -/// @param event -/// -void FrameMain::OnDetachVideo(wxCommandEvent &event) { +void FrameMain::OnDetachVideo(wxCommandEvent &) { DetachVideo(!detachedVideo); } - - /// @brief Use dummy video -/// @param event -/// -void FrameMain::OnDummyVideo (wxCommandEvent &event) { +void FrameMain::OnDummyVideo (wxCommandEvent &) { wxString fn; if (DialogDummyVideo::CreateDummyVideo(this, fn)) { LoadVideo(fn); } } - - /// @brief Overscan toggle -/// @param event -/// void FrameMain::OnOverscan (wxCommandEvent &event) { OPT_SET("Video/Overscan Mask")->SetBool(event.IsChecked()); VideoContext::Get()->Stop(); videoBox->videoDisplay->Render(); } - - /// @brief Show video details -/// @param event -/// -void FrameMain::OnOpenVideoDetails (wxCommandEvent &event) { +void FrameMain::OnOpenVideoDetails (wxCommandEvent &) { VideoContext::Get()->Stop(); DialogVideoDetails videodetails(this); - videodetails.ShowModal(); + videodetails.ShowModal(); } - - /// @brief Open jump to dialog -/// @param event -/// -void FrameMain::OnJumpTo(wxCommandEvent& WXUNUSED(event)) { +void FrameMain::OnJumpTo(wxCommandEvent&) { VideoContext::Get()->Stop(); if (VideoContext::Get()->IsLoaded()) { DialogJumpTo JumpTo(this); @@ -1094,23 +913,15 @@ void FrameMain::OnJumpTo(wxCommandEvent& WXUNUSED(event)) { } } - - /// @brief Open shift dialog -/// @param event -/// -void FrameMain::OnShift(wxCommandEvent& WXUNUSED(event)) { +void FrameMain::OnShift(wxCommandEvent&) { VideoContext::Get()->Stop(); DialogShiftTimes Shift(this,SubsBox); Shift.ShowModal(); } - - /// @brief Open properties -/// @param event -/// -void FrameMain::OnOpenProperties (wxCommandEvent &event) { +void FrameMain::OnOpenProperties (wxCommandEvent &) { VideoContext::Get()->Stop(); DialogProperties Properties(this); int res = Properties.ShowModal(); @@ -1119,12 +930,8 @@ void FrameMain::OnOpenProperties (wxCommandEvent &event) { } } - - /// @brief Open styles manager -/// @param event -/// -void FrameMain::OnOpenStylesManager(wxCommandEvent& WXUNUSED(event)) { +void FrameMain::OnOpenStylesManager(wxCommandEvent&) { VideoContext::Get()->Stop(); DialogStyleManager StyleManager(this,SubsBox); StyleManager.ShowModal(); @@ -1132,23 +939,15 @@ void FrameMain::OnOpenStylesManager(wxCommandEvent& WXUNUSED(event)) { SubsBox->CommitChanges(); } - - /// @brief Open attachments -/// @param event -/// -void FrameMain::OnOpenAttachments(wxCommandEvent& WXUNUSED(event)) { +void FrameMain::OnOpenAttachments(wxCommandEvent&) { VideoContext::Get()->Stop(); DialogAttachments attachments(this); attachments.ShowModal(); } - - /// @brief Open translation assistant -/// @param event -/// -void FrameMain::OnOpenTranslation(wxCommandEvent& WXUNUSED(event)) { +void FrameMain::OnOpenTranslation(wxCommandEvent&) { VideoContext::Get()->Stop(); int start = SubsBox->GetFirstSelRow(); if (start == -1) start = 0; @@ -1156,64 +955,40 @@ void FrameMain::OnOpenTranslation(wxCommandEvent& WXUNUSED(event)) { Trans.ShowModal(); } - - /// @brief Open Spell Checker -/// @param event -/// -void FrameMain::OnOpenSpellCheck (wxCommandEvent &event) { +void FrameMain::OnOpenSpellCheck (wxCommandEvent &) { VideoContext::Get()->Stop(); new DialogSpellChecker(this); - //DialogSpellChecker *spell = - //spell->ShowModal(); } - - /// @brief Open Fonts Collector -/// @param event -/// -void FrameMain::OnOpenFontsCollector (wxCommandEvent &event) { +void FrameMain::OnOpenFontsCollector (wxCommandEvent &) { VideoContext::Get()->Stop(); DialogFontsCollector Collector(this); Collector.ShowModal(); } - - /// @brief Open Resolution Resampler -/// @param event -/// -void FrameMain::OnOpenResample (wxCommandEvent &event) { +void FrameMain::OnOpenResample (wxCommandEvent &) { VideoContext::Get()->Stop(); DialogResample diag(this, SubsBox); diag.ShowModal(); } - - /// @brief Open Timing post-processor dialog -/// @param event -/// -void FrameMain::OnOpenTimingProcessor (wxCommandEvent &event) { +void FrameMain::OnOpenTimingProcessor (wxCommandEvent &) { DialogTimingProcessor timing(this,SubsBox); timing.ShowModal(); } /// @brief Open Kanji Timer dialog -/// @param event -/// -void FrameMain::OnOpenKanjiTimer (wxCommandEvent &event) { +void FrameMain::OnOpenKanjiTimer (wxCommandEvent &) { DialogKanjiTimer kanjitimer(this,SubsBox); kanjitimer.ShowModal(); } - - /// @brief Open Options dialog -/// @param event -/// -void FrameMain::OnOpenPreferences (wxCommandEvent &event) { +void FrameMain::OnOpenPreferences (wxCommandEvent &) { try { Preferences pref(this); pref.ShowModal(); @@ -1223,21 +998,13 @@ void FrameMain::OnOpenPreferences (wxCommandEvent &event) { } } - - /// @brief Launch ASSDraw -/// @param event -/// -void FrameMain::OnOpenASSDraw (wxCommandEvent &event) { +void FrameMain::OnOpenASSDraw (wxCommandEvent &) { wxExecute(_T("\"") + StandardPaths::DecodePath(_T("?data/ASSDraw3.exe")) + _T("\"")); } - - /// @brief Open Automation -/// @param event -/// -void FrameMain::OnOpenAutomation (wxCommandEvent &event) { +void FrameMain::OnOpenAutomation (wxCommandEvent &) { #ifdef WITH_AUTOMATION #ifdef __APPLE__ if (wxGetMouseState().CmdDown()) { @@ -1273,11 +1040,8 @@ void FrameMain::OnOpenAutomation (wxCommandEvent &event) { #endif } - - -/// @brief General handler for all Automation-generated menu items +/// @brief General handler for all Automation-generated menu items /// @param event -/// void FrameMain::OnAutomationMacro (wxCommandEvent &event) { #ifdef WITH_AUTOMATION SubsBox->BeginBatch(); @@ -1299,12 +1063,8 @@ void FrameMain::OnAutomationMacro (wxCommandEvent &event) { #endif } - - /// @brief Snap subs to video -/// @param event -/// -void FrameMain::OnSnapSubsStartToVid (wxCommandEvent &event) { +void FrameMain::OnSnapSubsStartToVid (wxCommandEvent &) { if (VideoContext::Get()->IsLoaded() && SubsBox->GetSelection().Count() > 0) { SubsBox->SetSubsToVideo(true); } @@ -1312,20 +1072,14 @@ void FrameMain::OnSnapSubsStartToVid (wxCommandEvent &event) { /// @brief DOCME -/// @param event -/// -void FrameMain::OnSnapSubsEndToVid (wxCommandEvent &event) { +void FrameMain::OnSnapSubsEndToVid (wxCommandEvent &) { if (VideoContext::Get()->IsLoaded() && SubsBox->GetSelection().Count() > 0) { SubsBox->SetSubsToVideo(false); } } - - /// @brief Jump video to subs -/// @param event -/// -void FrameMain::OnSnapVidToSubsStart (wxCommandEvent &event) { +void FrameMain::OnSnapVidToSubsStart (wxCommandEvent &) { if (VideoContext::Get()->IsLoaded() && SubsBox->GetSelection().Count() > 0) { SubsBox->SetVideoToSubs(true); } @@ -1333,20 +1087,14 @@ void FrameMain::OnSnapVidToSubsStart (wxCommandEvent &event) { /// @brief DOCME -/// @param event -/// -void FrameMain::OnSnapVidToSubsEnd (wxCommandEvent &event) { +void FrameMain::OnSnapVidToSubsEnd (wxCommandEvent &) { if (VideoContext::Get()->IsLoaded() && SubsBox->GetSelection().Count() > 0) { SubsBox->SetVideoToSubs(false); } } - - /// @brief Snap to scene -/// @param event -/// -void FrameMain::OnSnapToScene (wxCommandEvent &event) { +void FrameMain::OnSnapToScene (wxCommandEvent &) { if (VideoContext::Get()->IsLoaded()) { // Get frames wxArrayInt sel = SubsBox->GetSelection(); @@ -1403,15 +1151,9 @@ void FrameMain::OnSnapToScene (wxCommandEvent &event) { } } - - /// @brief Shift to frame -/// @param event -/// @return -/// -void FrameMain::OnShiftToFrame (wxCommandEvent &event) { +void FrameMain::OnShiftToFrame (wxCommandEvent &) { if (VideoContext::Get()->IsLoaded()) { - // Get selection wxArrayInt sels = SubsBox->GetSelection(); size_t n=sels.Count(); if (n == 0) return; @@ -1437,117 +1179,70 @@ void FrameMain::OnShiftToFrame (wxCommandEvent &event) { } } - - /// @brief Undo -/// @param event -/// @return -/// -void FrameMain::OnUndo(wxCommandEvent& WXUNUSED(event)) { - // Block if it's on a editbox - //wxWindow *focused = wxWindow::FindFocus(); - //if (focused && focused->IsKindOf(CLASSINFO(wxTextCtrl))) return; - +void FrameMain::OnUndo(wxCommandEvent&) { VideoContext::Get()->Stop(); AssFile::StackPop(); SubsBox->LoadFromAss(AssFile::top,true); AssFile::Popping = false; } - - /// @brief Redo -/// @param event -/// -void FrameMain::OnRedo(wxCommandEvent& WXUNUSED(event)) { +void FrameMain::OnRedo(wxCommandEvent&) { VideoContext::Get()->Stop(); AssFile::StackRedo(); SubsBox->LoadFromAss(AssFile::top,true); AssFile::Popping = false; } - - /// @brief Find -/// @param event -/// -void FrameMain::OnFind(wxCommandEvent &event) { +void FrameMain::OnFind(wxCommandEvent &) { VideoContext::Get()->Stop(); Search.OpenDialog(false); } - - /// @brief Find next -/// @param event -/// -void FrameMain::OnFindNext(wxCommandEvent &event) { +void FrameMain::OnFindNext(wxCommandEvent &) { VideoContext::Get()->Stop(); Search.FindNext(); } - - /// @brief Find & replace -/// @param event -/// -void FrameMain::OnReplace(wxCommandEvent &event) { +void FrameMain::OnReplace(wxCommandEvent &) { VideoContext::Get()->Stop(); Search.OpenDialog(true); } - - /// @brief Change aspect ratio to default -/// @param event -/// -void FrameMain::OnSetARDefault (wxCommandEvent &event) { +void FrameMain::OnSetARDefault (wxCommandEvent &) { VideoContext::Get()->Stop(); VideoContext::Get()->SetAspectRatio(0); SetDisplayMode(1,-1); } - - /// @brief Change aspect ratio to fullscreen -/// @param event -/// -void FrameMain::OnSetARFull (wxCommandEvent &event) { +void FrameMain::OnSetARFull (wxCommandEvent &) { VideoContext::Get()->Stop(); VideoContext::Get()->SetAspectRatio(1); SetDisplayMode(1,-1); } - - /// @brief Change aspect ratio to widescreen -/// @param event -/// -void FrameMain::OnSetARWide (wxCommandEvent &event) { +void FrameMain::OnSetARWide (wxCommandEvent &) { VideoContext::Get()->Stop(); VideoContext::Get()->SetAspectRatio(2); SetDisplayMode(1,-1); } - - /// @brief Change aspect ratio to 2:35 -/// @param event -/// -void FrameMain::OnSetAR235 (wxCommandEvent &event) { +void FrameMain::OnSetAR235 (wxCommandEvent &) { VideoContext::Get()->Stop(); VideoContext::Get()->SetAspectRatio(3); SetDisplayMode(1,-1); } - - /// @brief Change aspect ratio to a custom value -/// @param event -/// @return -/// -void FrameMain::OnSetARCustom (wxCommandEvent &event) { - // Get text +void FrameMain::OnSetARCustom (wxCommandEvent &) { VideoContext::Get()->Stop(); wxString value = wxGetTextFromUser(_("Enter aspect ratio in either:\n decimal (e.g. 2.35)\n fractional (e.g. 16:9)\n specific resolution (e.g. 853x480)"),_("Enter aspect ratio"),AegiFloatToString(VideoContext::Get()->GetAspectRatioValue())); @@ -1594,11 +1289,8 @@ void FrameMain::OnSetARCustom (wxCommandEvent &event) { } } - - -/// @brief Window is attempted to be closed -/// @param event -/// +/// @brief Window is attempted to be closed +/// @param event void FrameMain::OnCloseWindow (wxCloseEvent &event) { // Stop audio and video VideoContext::Get()->Stop(); @@ -1619,13 +1311,8 @@ void FrameMain::OnCloseWindow (wxCloseEvent &event) { else Destroy(); } - - /// @brief Cut/copy/paste -/// @param event -/// @return -/// -void FrameMain::OnCut (wxCommandEvent &event) { +void FrameMain::OnCut (wxCommandEvent &) { if (FindFocus() == EditBox->TextEdit) { EditBox->TextEdit->Cut(); return; @@ -1635,10 +1322,7 @@ void FrameMain::OnCut (wxCommandEvent &event) { /// @brief DOCME -/// @param event -/// @return -/// -void FrameMain::OnCopy (wxCommandEvent &event) { +void FrameMain::OnCopy (wxCommandEvent &) { if (FindFocus() == EditBox->TextEdit) { EditBox->TextEdit->Copy(); return; @@ -1648,10 +1332,7 @@ void FrameMain::OnCopy (wxCommandEvent &event) { /// @brief DOCME -/// @param event -/// @return -/// -void FrameMain::OnPaste (wxCommandEvent &event) { +void FrameMain::OnPaste (wxCommandEvent &) { if (FindFocus() == EditBox->TextEdit) { EditBox->TextEdit->Paste(); return; @@ -1659,31 +1340,19 @@ void FrameMain::OnPaste (wxCommandEvent &event) { SubsBox->PasteLines(SubsBox->GetFirstSelRow()); } - - /// @brief Paste over -/// @param event -/// -void FrameMain::OnPasteOver (wxCommandEvent &event) { +void FrameMain::OnPasteOver (wxCommandEvent &) { SubsBox->PasteLines(SubsBox->GetFirstSelRow(),true); } - - /// @brief Select visible lines -/// @param event -/// -void FrameMain::OnSelectVisible (wxCommandEvent &event) { +void FrameMain::OnSelectVisible (wxCommandEvent &) { VideoContext::Get()->Stop(); SubsBox->SelectVisible(); } - - /// @brief Open select dialog -/// @param event -/// -void FrameMain::OnSelect (wxCommandEvent &event) { +void FrameMain::OnSelect (wxCommandEvent &) { VideoContext::Get()->Stop(); DialogSelection select(this, SubsBox); select.ShowModal(); @@ -1712,20 +1381,14 @@ void FrameMain::OnSortStyle (wxCommandEvent &) { } /// @brief Open styling assistant -/// @param event -/// -void FrameMain::OnOpenStylingAssistant (wxCommandEvent &event) { +void FrameMain::OnOpenStylingAssistant (wxCommandEvent &) { VideoContext::Get()->Stop(); if (!stylingAssistant) stylingAssistant = new DialogStyling(this,SubsBox); stylingAssistant->Show(true); } - - /// @brief Autosave the currently open file, if any -/// @param event Unused -/// -void FrameMain::OnAutoSave(wxTimerEvent &event) { +void FrameMain::OnAutoSave(wxTimerEvent &) { // Auto Save try { if (AssFile::top->loaded) { @@ -1767,37 +1430,23 @@ void FrameMain::OnAutoSave(wxTimerEvent &event) { } } - - /// @brief Clear statusbar -/// @param event -/// -void FrameMain::OnStatusClear(wxTimerEvent &event) { +void FrameMain::OnStatusClear(wxTimerEvent &) { SetStatusText(_T(""),1); } /// @brief Next frame hotkey -/// @param event -/// -void FrameMain::OnNextFrame(wxCommandEvent &event) { +void FrameMain::OnNextFrame(wxCommandEvent &) { videoBox->videoSlider->NextFrame(); } - - /// @brief Previous frame hotkey -/// @param event -/// -void FrameMain::OnPrevFrame(wxCommandEvent &event) { +void FrameMain::OnPrevFrame(wxCommandEvent &) { videoBox->videoSlider->PrevFrame(); } - - /// @brief Toggle focus between seek bar and whatever else -/// @param event -/// -void FrameMain::OnFocusSeek(wxCommandEvent &event) { +void FrameMain::OnFocusSeek(wxCommandEvent &) { wxWindow *curFocus = wxWindow::FindFocus(); if (curFocus == videoBox->videoSlider) { if (PreviousFocus) PreviousFocus->SetFocus(); @@ -1808,13 +1457,8 @@ void FrameMain::OnFocusSeek(wxCommandEvent &event) { } } - - /// @brief Previous line hotkey -/// @param event -/// @return -/// -void FrameMain::OnPrevLine(wxCommandEvent &event) { +void FrameMain::OnPrevLine(wxCommandEvent &) { int next = EditBox->linen-1; if (next < 0) return; SubsBox->SelectRow(next); @@ -1822,13 +1466,8 @@ void FrameMain::OnPrevLine(wxCommandEvent &event) { EditBox->SetToLine(next); } - - /// @brief Next line hotkey -/// @param event -/// @return -/// -void FrameMain::OnNextLine(wxCommandEvent &event) { +void FrameMain::OnNextLine(wxCommandEvent &) { int nrows = SubsBox->GetRows(); int next = EditBox->linen+1; if (next >= nrows) return; @@ -1837,8 +1476,6 @@ void FrameMain::OnNextLine(wxCommandEvent &event) { EditBox->SetToLine(next); } - - /// @brief Cycle through tag hiding modes void FrameMain::OnToggleTags(wxCommandEvent &) { int tagMode = OPT_GET("Subtitle/Grid/Hide Overrides")->GetInt(); @@ -1864,11 +1501,8 @@ void FrameMain::OnSetTags(wxCommandEvent &event) { SubsBox->Refresh(false); } - /// @brief Commit Edit Box's changes /// @param event -/// @return -/// void FrameMain::OnEditBoxCommit(wxCommandEvent &event) { // Find focus wxWindow *focus = FindFocus(); @@ -1894,9 +1528,7 @@ void FrameMain::OnEditBoxCommit(wxCommandEvent &event) { /// @brief Choose a different language -/// @param event -/// -void FrameMain::OnChooseLanguage (wxCommandEvent &event) { +void FrameMain::OnChooseLanguage (wxCommandEvent &) { // Get language AegisubApp *app = (AegisubApp*) wxTheApp; int old = app->locale.curCode; @@ -1923,60 +1555,35 @@ void FrameMain::OnChooseLanguage (wxCommandEvent &event) { } } - - /// @brief View standard -/// @param event -/// @return -/// -void FrameMain::OnViewStandard (wxCommandEvent &event) { +void FrameMain::OnViewStandard (wxCommandEvent &) { SetDisplayMode(1,1); } - - /// @brief View video -/// @param event -/// @return -/// -void FrameMain::OnViewVideo (wxCommandEvent &event) { +void FrameMain::OnViewVideo (wxCommandEvent &) { SetDisplayMode(1,0); } - - /// @brief View audio -/// @param event -/// @return -/// -void FrameMain::OnViewAudio (wxCommandEvent &event) { +void FrameMain::OnViewAudio (wxCommandEvent &) { SetDisplayMode(0,1); } - - /// @brief View subs -/// @param event -/// -void FrameMain::OnViewSubs (wxCommandEvent &event) { +void FrameMain::OnViewSubs (wxCommandEvent &) { SetDisplayMode(0,0); } - - /// @brief Medusa shortcuts -/// @param event -/// -void FrameMain::OnMedusaPlay(wxCommandEvent &event) { +void FrameMain::OnMedusaPlay(wxCommandEvent &) { int start=0,end=0; audioBox->audioDisplay->GetTimesSelection(start,end); audioBox->audioDisplay->Play(start,end); } /// @brief DOCME -/// @param event -/// -void FrameMain::OnMedusaStop(wxCommandEvent &event) { +void FrameMain::OnMedusaStop(wxCommandEvent &) { // Playing, stop if (audioBox->audioDisplay->player->IsPlaying()) { audioBox->audioDisplay->Stop(); @@ -1992,9 +1599,7 @@ void FrameMain::OnMedusaStop(wxCommandEvent &event) { } /// @brief DOCME -/// @param event -/// -void FrameMain::OnMedusaShiftStartForward(wxCommandEvent &event) { +void FrameMain::OnMedusaShiftStartForward(wxCommandEvent &) { audioBox->audioDisplay->curStartMS += 10; audioBox->audioDisplay->Update(); audioBox->audioDisplay->wxWindow::Update(); @@ -2002,9 +1607,7 @@ void FrameMain::OnMedusaShiftStartForward(wxCommandEvent &event) { } /// @brief DOCME -/// @param event -/// -void FrameMain::OnMedusaShiftStartBack(wxCommandEvent &event) { +void FrameMain::OnMedusaShiftStartBack(wxCommandEvent &) { audioBox->audioDisplay->curStartMS -= 10; audioBox->audioDisplay->Update(); audioBox->audioDisplay->wxWindow::Update(); @@ -2012,9 +1615,7 @@ void FrameMain::OnMedusaShiftStartBack(wxCommandEvent &event) { } /// @brief DOCME -/// @param event -/// -void FrameMain::OnMedusaShiftEndForward(wxCommandEvent &event) { +void FrameMain::OnMedusaShiftEndForward(wxCommandEvent &) { audioBox->audioDisplay->curEndMS += 10; audioBox->audioDisplay->Update(); audioBox->audioDisplay->wxWindow::Update(); @@ -2022,9 +1623,7 @@ void FrameMain::OnMedusaShiftEndForward(wxCommandEvent &event) { } /// @brief DOCME -/// @param event -/// -void FrameMain::OnMedusaShiftEndBack(wxCommandEvent &event) { +void FrameMain::OnMedusaShiftEndBack(wxCommandEvent &) { audioBox->audioDisplay->curEndMS -= 10; audioBox->audioDisplay->Update(); audioBox->audioDisplay->wxWindow::Update(); @@ -2032,42 +1631,30 @@ void FrameMain::OnMedusaShiftEndBack(wxCommandEvent &event) { } /// @brief DOCME -/// @param event -/// -void FrameMain::OnMedusaPlayBefore(wxCommandEvent &event) { +void FrameMain::OnMedusaPlayBefore(wxCommandEvent &) { int start=0,end=0; audioBox->audioDisplay->GetTimesSelection(start,end); audioBox->audioDisplay->Play(start-500,start); } /// @brief DOCME -/// @param event -/// -void FrameMain::OnMedusaPlayAfter(wxCommandEvent &event) { +void FrameMain::OnMedusaPlayAfter(wxCommandEvent &) { int start=0,end=0; audioBox->audioDisplay->GetTimesSelection(start,end); audioBox->audioDisplay->Play(end,end+500); } /// @brief DOCME -/// @param event -/// -void FrameMain::OnMedusaNext(wxCommandEvent &event) { +void FrameMain::OnMedusaNext(wxCommandEvent &) { audioBox->audioDisplay->Next(false); } /// @brief DOCME -/// @param event -/// -void FrameMain::OnMedusaPrev(wxCommandEvent &event) { +void FrameMain::OnMedusaPrev(wxCommandEvent &) { audioBox->audioDisplay->Prev(false); } /// @brief DOCME -/// @param event -/// -void FrameMain::OnMedusaEnter(wxCommandEvent &event) { +void FrameMain::OnMedusaEnter(wxCommandEvent &) { audioBox->audioDisplay->CommitChanges(true); } - -