From 7b68c1331897a996bbfba635a8711ab9a2956307 Mon Sep 17 00:00:00 2001 From: Niels Martin Hansen Date: Thu, 23 Nov 2006 17:26:53 +0000 Subject: [PATCH] Implemented #202 (frame-number in framegrab filenames) Originally committed to SVN as r552. --- core/changelog.txt | 2 ++ core/frame_main.cpp | 2 +- core/video_display.cpp | 6 ++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/core/changelog.txt b/core/changelog.txt index b621c7727..685483a49 100644 --- a/core/changelog.txt +++ b/core/changelog.txt @@ -17,6 +17,8 @@ Please visit http://aegisub.net to download latest version o Note that this (unfortunately) doesn't affect video/audio loading, since those still depend on Avisynth, which doesn't support Unicode at all - Video display fixed on Linux and maybe also Mac (Azzy) - Misc. fixes for building on Linux (Azzy) +- Redesigned the FexTracker configuration window (jfs) +- Framegrabs from the video now also includes framenumber in the filename (jfs) = 1.10 beta - 2006.08.07 =========================== diff --git a/core/frame_main.cpp b/core/frame_main.cpp index a2b3e4b42..3a8464f56 100644 --- a/core/frame_main.cpp +++ b/core/frame_main.cpp @@ -287,7 +287,7 @@ void FrameMain::InitMenu() { videoMenu->AppendCheckItem(Menu_Video_AR_Default, _("&Default Aspect Ratio"), _("Leave video on original aspect ratio")); videoMenu->AppendCheckItem(Menu_Video_AR_Full, _("&Fullscreen Aspect Ratio (4:3)"), _("Forces video to fullscreen aspect ratio")); videoMenu->AppendCheckItem(Menu_Video_AR_Wide, _("&Widescreen Aspect Ratio (16:9)"), _("Forces video to widescreen aspect ratio")); - videoMenu->AppendCheckItem(Menu_Video_AR_235, _("&2.35 Aspect Ratio"), _("Forces video to 2.35 aspect ratio")); + videoMenu->AppendCheckItem(Menu_Video_AR_235, _("2.&35 Aspect Ratio"), _("Forces video to 2.35 aspect ratio")); videoMenu->AppendCheckItem(Menu_Video_AR_Custom, _("Custom Aspect Ratio..."), _("Forces video to a custom aspect ratio")); MenuBar->Append(videoMenu, _("&Video")); diff --git a/core/video_display.cpp b/core/video_display.cpp index 8806cadb7..a918cdbe0 100644 --- a/core/video_display.cpp +++ b/core/video_display.cpp @@ -630,12 +630,14 @@ void VideoDisplay::OnSaveSnapshot(wxCommandEvent &event) { } void VideoDisplay::SaveSnapshot() { + static int session_shot_count = 1; // Get path wxFileName file = videoName; wxString basepath = file.GetPath() + _T("/") + file.GetName(); wxString path; - for (int i=0;;i++) { - path = basepath + wxString::Format(_T("_%03i.png"),i); + while (1) { + path = basepath + wxString::Format(_T("_%03i_%i.png"),session_shot_count,frame_n); + ++session_shot_count; wxFileName tryPath(path); if (!tryPath.FileExists()) break; }