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

Originally committed to SVN as r288.

Browse source
This commit is contained in:
Rodrigo Braz Monteiro 2006-04-02 03:34:56 +00:00
parent d920efa33d
commit ec1fab1db7
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/dialog_fextracker.cpp
View file

@ -74,11 +74,11 @@ DialogFexTracker::DialogFexTracker(wxWindow *parent, FexTrackerConfig *_cfg)
StdWnd->SetSizer( Sizer ); StdWnd->SetSizer( Sizer );
StdWnd->SetAutoLayout( 1 ); StdWnd->SetAutoLayout( 1 );
MainNB->AddPage( StdWnd, _T("Standard Settings") ); MainNB->AddPage( StdWnd, _("Standard Settings") );
AdvWnd->SetSizer( SizerAdd ); AdvWnd->SetSizer( SizerAdd );
AdvWnd->SetAutoLayout( 1 ); AdvWnd->SetAutoLayout( 1 );
MainNB->AddPage( AdvWnd, _T("Advanced Settings") ); MainNB->AddPage( AdvWnd, _("Advanced Settings") );
wxSizer *MainSizer = new wxBoxSizer(wxVERTICAL); wxSizer *MainSizer = new wxBoxSizer(wxVERTICAL);
MainSizer->Add(MainNB,1,wxEXPAND|wxALL,5); MainSizer->Add(MainNB,1,wxEXPAND|wxALL,5);

10
core/subtitle_format_prs.cpp
View file

@ -135,8 +135,8 @@ void PRSSubtitleFormat::WriteFile(wxString filename,wxString encoding) {
// Update progress // Update progress
progress->SetProgress(drawn,toDraw); progress->SetProgress(drawn,toDraw);
progress->SetText(wxString::Format(_T("Writing PRS file. Line: %i/%i"),framen,totalFrames)); progress->SetText(wxString::Format(_T("Writing PRS file. Line: %i/%i (%.2f%%)"),framen,totalFrames,MIN(float(drawn)*100/toDraw,100.0)));
drawn++; if (frames[framen] == 2) drawn++;
// Read the frame image // Read the frame image
PVideoFrame frame1 = clip1->GetFrame(framen,env1); PVideoFrame frame1 = clip1->GetFrame(framen,env1);
@ -381,7 +381,7 @@ std::vector<int> PRSSubtitleFormat::GetFrameRanges() {
AssDialogue *diag = AssEntry::GetAsDialogue(*cur); AssDialogue *diag = AssEntry::GetAsDialogue(*cur);
// Dialogue found // Dialogue found
if (diag) { if (diag && !diag->Comment) {
// Parse tags // Parse tags
diag->ParseASSTags(); diag->ParseASSTags();
@ -412,8 +412,8 @@ std::vector<int> PRSSubtitleFormat::GetFrameRanges() {
size_t end = VFR_Output.GetFrameAtTime(diag->End.GetMS(),false); size_t end = VFR_Output.GetFrameAtTime(diag->End.GetMS(),false);
// Ensure that the vector is long enough // Ensure that the vector is long enough
// Yes, +2, this is an optimization for something below // Yes, +1, this is an optimization for something below
if (frames.size() <= end) frames.resize(end+2); if (frames.size() <= end+1) frames.resize(end+2);
// Fill data // Fill data
// 2 = Store this frame // 2 = Store this frame