From 3ce6d62f4e0dff0812b28470f8d0c590a2cc815c Mon Sep 17 00:00:00 2001 From: Rodrigo Braz Monteiro Date: Tue, 15 Jan 2008 00:54:54 +0000 Subject: [PATCH] Hopefully made Aegisub compile on Linux without WITH_FFMPEG. Originally committed to SVN as r1723. --- aegisub/font_file_lister.cpp | 4 ++-- aegisub/frame_main.cpp | 18 +++++++++--------- aegisub/lavc_keyframes.cpp | 4 ++++ aegisub/video_context.cpp | 12 ++++++++++-- 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/aegisub/font_file_lister.cpp b/aegisub/font_file_lister.cpp index acba8cbbb..0dee2adea 100644 --- a/aegisub/font_file_lister.cpp +++ b/aegisub/font_file_lister.cpp @@ -147,7 +147,7 @@ bool FontFileLister::IsFilenameCached(wxString filename) { void FontFileLister::SaveCache() { try { // Open file - TextFileWriter file(StandardPaths::DecodePath(_T("?user/fontcache.dat"))); + TextFileWriter file(StandardPaths::DecodePath(_T("?user/fontscache.dat"))); // For each face... for (FontMap::iterator iter = fontTable.begin();iter!=fontTable.end();iter++) { @@ -175,7 +175,7 @@ void FontFileLister::SaveCache() { void FontFileLister::LoadCache() { try { // Load cache - TextFileReader file(StandardPaths::DecodePath(_T("?user/fontcache.dat"))); + TextFileReader file(StandardPaths::DecodePath(_T("?user/fontscache.dat"))); // Read each line while (file.HasMoreLines()) { diff --git a/aegisub/frame_main.cpp b/aegisub/frame_main.cpp index 2c19f765b..50b20e2db 100644 --- a/aegisub/frame_main.cpp +++ b/aegisub/frame_main.cpp @@ -236,9 +236,10 @@ void FrameMain::InitToolbar () { Toolbar->AddSeparator(); // Property stuff - Toolbar->AddTool(Menu_Tools_Properties,_("Properties"),wxBITMAP(properties_toolbutton),_("Open Properties")); Toolbar->AddTool(Menu_Tools_Styles_Manager,_("Styles Manager"),wxBITMAP(style_toolbutton),_("Open Styles Manager")); + Toolbar->AddTool(Menu_Tools_Properties,_("Properties"),wxBITMAP(properties_toolbutton),_("Open Properties")); Toolbar->AddTool(Menu_Tools_Attachments,_("Attachments"),wxBITMAP(attach_button),_("Open Attachment List")); + Toolbar->AddTool(Menu_Tools_Fonts_Collector,_("Fonts Collector"),wxBITMAP(font_collector_button),_("Open Fonts Collector")); Toolbar->AddSeparator(); // Automation @@ -251,7 +252,6 @@ void FrameMain::InitToolbar () { Toolbar->AddTool(Menu_Edit_Shift,_("Shift Times"),wxBITMAP(shift_times_toolbutton),_("Open Shift Times Dialogue")); Toolbar->AddTool(Menu_Tools_Styling,_("Styling Assistant"),wxBITMAP(styling_toolbutton),_("Open Styling Assistant")); Toolbar->AddTool(Menu_Tools_Translation,_("Translation Assistant"),wxBITMAP(translation_toolbutton),_("Open Translation Assistant")); - Toolbar->AddTool(Menu_Tools_Fonts_Collector,_("Fonts Collector"),wxBITMAP(font_collector_button),_("Open Fonts Collector")); Toolbar->AddTool(Menu_Tools_Resample,_("Resample"),wxBITMAP(resample_toolbutton),_("Resample Script Resolution")); Toolbar->AddTool(Menu_Tools_Timing_Processor,_("Timing Post-Processor"),wxBITMAP(timing_processor_toolbutton),_("Open Timing Post-processor dialog")); Toolbar->AddTool(Menu_Tools_Kanji_Timer,_("Kanji Timer"),wxBITMAP(kanji_timer_button),_("Open Kanji Timer dialog")); @@ -313,6 +313,7 @@ void FrameMain::InitMenu() { fileMenu->AppendSeparator(); AppendBitmapMenuItem (fileMenu,Menu_Tools_Properties, _("&Properties..."), _("Open script properties window"),wxBITMAP(properties_toolbutton)); AppendBitmapMenuItem (fileMenu,Menu_Tools_Attachments, _("&Attachments..."), _("Open the attachment list"), wxBITMAP(attach_button)); + AppendBitmapMenuItem (fileMenu,Menu_Tools_Fonts_Collector, _("&Fonts Collector..."),_("Open fonts collector"), wxBITMAP(font_collector_button)); fileMenu->AppendSeparator(); #ifndef __APPLE__ // Doesn't work on Mac, only one instance is ever allowed there from OS side @@ -344,6 +345,12 @@ void FrameMain::InitMenu() { #ifndef __APPLE__ InsertParent->SetBitmap(wxBITMAP(blank_button)); #endif + AppendBitmapMenuItem (subtitlesMenu,Menu_Tools_Styles_Manager, _("&Styles Manager..."), _("Open styles manager"), wxBITMAP(style_toolbutton)); + AppendBitmapMenuItem (subtitlesMenu,Menu_Tools_Styling, _("St&yling Assistant..."), _("Open styling assistant"), wxBITMAP(styling_toolbutton)); + AppendBitmapMenuItem (subtitlesMenu,Menu_Tools_Translation, _("&Translation Assistant..."),_("Open translation assistant"), wxBITMAP(translation_toolbutton)); + AppendBitmapMenuItem (subtitlesMenu,Menu_Tools_Resample,_("Resample Resolution..."), _("Changes resolution and modifies subtitles to conform to change"), wxBITMAP(resample_toolbutton)); + AppendBitmapMenuItem (subtitlesMenu,Menu_Tools_SpellCheck, _("Spe&ll Checker..."),_("Open spell checker"), wxBITMAP(spellcheck_toolbutton)); + subtitlesMenu->AppendSeparator(); AppendBitmapMenuItem(InsertMenu,MENU_INSERT_BEFORE,_("&Before Current"),_("Inserts a line before current"),wxBITMAP(blank_button)); AppendBitmapMenuItem(InsertMenu,MENU_INSERT_AFTER,_("&After Current"),_("Inserts a line after current"),wxBITMAP(blank_button)); AppendBitmapMenuItem(InsertMenu,MENU_INSERT_BEFORE_VIDEO,_("Before Current, at Video Time"),_("Inserts a line before current, starting at video time"),wxBITMAP(blank_button)); @@ -367,13 +374,6 @@ void FrameMain::InitMenu() { subtitlesMenu->AppendSeparator(); AppendBitmapMenuItem(subtitlesMenu,MENU_SWAP,_("Swap Lines"),_("Swaps the two selected lines"),wxBITMAP(arrow_sort)); AppendBitmapMenuItem (subtitlesMenu,Menu_Edit_Select, MakeHotkeyText(_("Select Lines..."), _T("Select lines")), _("Selects lines based on defined criterea"),wxBITMAP(select_lines_button)); - subtitlesMenu->AppendSeparator(); - AppendBitmapMenuItem (subtitlesMenu,Menu_Tools_Styles_Manager, _("&Styles Manager..."), _("Open styles manager"), wxBITMAP(style_toolbutton)); - AppendBitmapMenuItem (subtitlesMenu,Menu_Tools_Styling, _("St&yling Assistant..."), _("Open styling assistant"), wxBITMAP(styling_toolbutton)); - AppendBitmapMenuItem (subtitlesMenu,Menu_Tools_Translation, _("&Translation Assistant..."),_("Open translation assistant"), wxBITMAP(translation_toolbutton)); - AppendBitmapMenuItem (subtitlesMenu,Menu_Tools_Resample,_("Resample Resolution..."), _("Changes resolution and modifies subtitles to conform to change"), wxBITMAP(resample_toolbutton)); - AppendBitmapMenuItem (subtitlesMenu,Menu_Tools_Fonts_Collector, _("&Fonts Collector..."),_("Open fonts collector"), wxBITMAP(font_collector_button)); - AppendBitmapMenuItem (subtitlesMenu,Menu_Tools_SpellCheck, _("Spe&ll Checker..."),_("Open spell checker"), wxBITMAP(spellcheck_toolbutton)); MenuBar->Append(subtitlesMenu, _("&Subtitles")); // Create timing menu diff --git a/aegisub/lavc_keyframes.cpp b/aegisub/lavc_keyframes.cpp index aac10f74a..a963925e6 100644 --- a/aegisub/lavc_keyframes.cpp +++ b/aegisub/lavc_keyframes.cpp @@ -36,6 +36,8 @@ /////////// // Headers +#include "config.h" +#ifdef WITH_FFMPEG #include "dialog_progress.h" #include "lavc_keyframes.h" @@ -130,3 +132,5 @@ wxArrayInt LAVCKeyFrames::GetKeyFrames() { return keyframes; } + +#endif // WITH_FFMPEG diff --git a/aegisub/video_context.cpp b/aegisub/video_context.cpp index bf9bb51e5..791b2eae0 100644 --- a/aegisub/video_context.cpp +++ b/aegisub/video_context.cpp @@ -62,9 +62,12 @@ #include "ass_style.h" #include "subs_grid.h" #include "vfw_wrap.h" +#include "config.h" #if !defined(__WINDOWS__) && !defined(__APPLE__) +#ifdef WITH_FFMPEG #include "lavc_keyframes.h" #endif +#endif #include "mkv_wrap.h" #include "options.h" #include "subs_edit_box.h" @@ -287,15 +290,20 @@ void VideoContext::SetVideo(const wxString &filename) { } else if (ext == _T(".avi")) { + keyFramesLoaded = false; + KeyFrames.Clear(); #ifdef __WINDOWS__ KeyFrames = VFWWrapper::GetKeyFrames(filename); + keyFramesLoaded = true; #else #ifndef __APPLE__ +#ifdef WITH_FFMPEG LAVCKeyFrames k(filename); KeyFrames = k.GetKeyFrames(); -#endif -#endif keyFramesLoaded = true; +#endif +#endif +#endif } // Check if the file is all keyframes