Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-28 15:02:35 +01:00
Code Issues Projects Releases Wiki Activity

Minor performance fixes

Browse Source
This commit is contained in:
niksedk 2014-09-11 06:22:57 +02:00
parent 9f031379f6
commit da42c014a4
3 changed files with 50 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/Controls/SubtitleListView.cs
View File

@ -866,6 +866,44 @@ namespace Nikse.SubtitleEdit.Controls
}
public void SetStartTime(int index, Paragraph paragraph)
{
if (index >= 0 && index < Items.Count)
{
ListViewItem item = Items[index];
if (Configuration.Settings != null && Configuration.Settings.General.UseTimeFormatHHMMSSFF)
{
if (paragraph.StartTime.IsMaxTime)
item.SubItems[ColumnIndexStart].Text = "-";
else
item.SubItems[ColumnIndexStart].Text = paragraph.StartTime.ToHHMMSSFF();
if (paragraph.EndTime.IsMaxTime)
item.SubItems[ColumnIndexEnd].Text = "-";
else
item.SubItems[ColumnIndexEnd].Text = paragraph.EndTime.ToHHMMSSFF();
item.SubItems[ColumnIndexDuration].Text = string.Format("{0},{1:00}", paragraph.Duration.Seconds, Logic.SubtitleFormats.SubtitleFormat.MillisecondsToFramesMaxFrameRate(paragraph.Duration.Milliseconds));
item.SubItems[ColumnIndexEnd].Text = paragraph.EndTime.ToHHMMSSFF();
}
else
{
if (paragraph.StartTime.IsMaxTime)
item.SubItems[ColumnIndexStart].Text = "-";
else
item.SubItems[ColumnIndexStart].Text = paragraph.StartTime.ToString();
if (paragraph.EndTime.IsMaxTime)
item.SubItems[ColumnIndexEnd].Text = "-";
else
item.SubItems[ColumnIndexEnd].Text = paragraph.EndTime.ToString();
item.SubItems[ColumnIndexDuration].Text = string.Format("{0},{1:000}", paragraph.Duration.Seconds, paragraph.Duration.Milliseconds);
item.SubItems[ColumnIndexEnd].Text = paragraph.EndTime.ToString();
}
}
}
public void SetStartTimeAndDuration(int index, Paragraph paragraph)
{
if (index >= 0 && index < Items.Count)
{

33
src/Forms/Main.cs
View File

@ -1347,8 +1347,7 @@ namespace Nikse.SubtitleEdit.Forms
index = _subtitle.GetIndex(current);
SubtitleListview1.SetStartTime(index, paragraph);
SubtitleListview1.SetDuration(index, paragraph);
SubtitleListview1.SetStartTimeAndDuration(index, paragraph);
if (index == selectedIndex)
{
@ -1377,8 +1376,7 @@ namespace Nikse.SubtitleEdit.Forms
original.StartTime.TotalMilliseconds = paragraph.StartTime.TotalMilliseconds;
original.EndTime.TotalMilliseconds = paragraph.EndTime.TotalMilliseconds;
}
SubtitleListview1.SetStartTime(index, paragraph);
SubtitleListview1.SetDuration(index, paragraph);
SubtitleListview1.SetStartTimeAndDuration(index, paragraph);
}
}
else
@ -1394,8 +1392,7 @@ namespace Nikse.SubtitleEdit.Forms
MovePrevNext(e, beforeParagraph, index);
}
SubtitleListview1.SetStartTime(index, paragraph);
SubtitleListview1.SetDuration(index, paragraph);
SubtitleListview1.SetStartTimeAndDuration(index, paragraph);
}
}
beforeParagraph.StartTime.TotalMilliseconds = paragraph.StartTime.TotalMilliseconds;
@ -1413,8 +1410,7 @@ namespace Nikse.SubtitleEdit.Forms
if (prev != null)
{
prev.EndTime.TotalMilliseconds = prev.EndTime.TotalMilliseconds + (e.Paragraph.StartTime.TotalMilliseconds - beforeParagraph.StartTime.TotalMilliseconds);
SubtitleListview1.SetStartTime(index - 1, prev);
SubtitleListview1.SetDuration(index - 1, prev);
SubtitleListview1.SetStartTimeAndDuration(index - 1, prev);
audioVisualizer.Invalidate();
}
}
@ -1424,8 +1420,7 @@ namespace Nikse.SubtitleEdit.Forms
if (next != null)
{
next.StartTime.TotalMilliseconds = next.StartTime.TotalMilliseconds + (e.Paragraph.EndTime.TotalMilliseconds - beforeParagraph.EndTime.TotalMilliseconds);
SubtitleListview1.SetStartTime(index + 1, next);
SubtitleListview1.SetDuration(index + 1, next);
SubtitleListview1.SetStartTimeAndDuration(index + 1, next);
audioVisualizer.Invalidate();
}
}
@ -11379,8 +11374,7 @@ namespace Nikse.SubtitleEdit.Forms
MakeHistoryForUndoOnlyIfNotResent(string.Format(_language.VideoControls.BeforeChangingTimeInWaveFormX, "#" + _subtitle.Paragraphs[index].Number + " " + _subtitle.Paragraphs[index].Text));
_subtitle.Paragraphs[index].EndTime = TimeCode.FromSeconds(videoPosition);
SubtitleListview1.SetStartTime(index, _subtitle.Paragraphs[index]);
SubtitleListview1.SetDuration(index, _subtitle.Paragraphs[index]);
SubtitleListview1.SetStartTimeAndDuration(index, _subtitle.Paragraphs[index]);
SetDurationInSeconds(_subtitle.Paragraphs[index].Duration.TotalSeconds);
@ -13710,8 +13704,7 @@ namespace Nikse.SubtitleEdit.Forms
if (oldParagraph.StartTime.IsMaxTime)
p.EndTime.TotalMilliseconds = p.StartTime.TotalMilliseconds + Utilities.GetOptimalDisplayMilliseconds(p.Text);
SubtitleListview1.SetStartTime(index, p);
SubtitleListview1.SetDuration(index, p);
SubtitleListview1.SetStartTimeAndDuration(index, p);
timeUpDownStartTime.TimeCode = p.StartTime;
timeUpDownStartTime.MaskedTextBox.TextChanged += MaskedTextBoxTextChanged;
@ -13740,8 +13733,7 @@ namespace Nikse.SubtitleEdit.Forms
MakeHistoryForUndoOnlyIfNotResent(string.Format(_language.VideoControls.BeforeChangingTimeInWaveFormX, "#" + _subtitle.Paragraphs[index].Number + " " + _subtitle.Paragraphs[index].Text));
_subtitle.Paragraphs[index].EndTime = TimeCode.FromSeconds(videoPosition);
SubtitleListview1.SetStartTime(index, _subtitle.Paragraphs[index]);
SubtitleListview1.SetDuration(index, _subtitle.Paragraphs[index]);
SubtitleListview1.SetStartTimeAndDuration(index, _subtitle.Paragraphs[index]);
if (index + 1 < _subtitle.Paragraphs.Count)
{
@ -13792,8 +13784,7 @@ namespace Nikse.SubtitleEdit.Forms
if (_subtitle.Paragraphs[index].Duration.TotalMilliseconds < Configuration.Settings.General.SubtitleMinimumDisplayMilliseconds)
_subtitle.Paragraphs[index].Duration.TotalMilliseconds = Configuration.Settings.General.SubtitleMinimumDisplayMilliseconds;
}
SubtitleListview1.SetStartTime(index, _subtitle.Paragraphs[index]);
SubtitleListview1.SetDuration(index, _subtitle.Paragraphs[index]);
SubtitleListview1.SetStartTimeAndDuration(index, _subtitle.Paragraphs[index]);
SetDurationInSeconds(_subtitle.Paragraphs[index].Duration.TotalSeconds);
}
}
@ -17454,8 +17445,7 @@ namespace Nikse.SubtitleEdit.Forms
prev.EndTime.TotalMilliseconds = _subtitle.Paragraphs[index].StartTime.TotalMilliseconds - minDiff;
}
_subtitle.Paragraphs[index].EndTime.TotalMilliseconds = _subtitle.Paragraphs[index].StartTime.TotalMilliseconds + duration;
SubtitleListview1.SetStartTime(index, _subtitle.Paragraphs[index]);
SubtitleListview1.SetDuration(index, _subtitle.Paragraphs[index]);
SubtitleListview1.SetStartTimeAndDuration(index, _subtitle.Paragraphs[index]);
timeUpDownStartTime.TimeCode = _subtitle.Paragraphs[index].StartTime;
timeUpDownStartTime.MaskedTextBox.TextChanged += MaskedTextBoxTextChanged;
UpdateOriginalTimeCodes(oldParagraph);
@ -17498,8 +17488,7 @@ namespace Nikse.SubtitleEdit.Forms
if (p.Duration.TotalSeconds < 0 || p.Duration.TotalSeconds > 10)
p.EndTime.TotalMilliseconds = p.StartTime.TotalMilliseconds + Utilities.GetOptimalDisplayMilliseconds(p.Text);
SubtitleListview1.SetStartTime(index, p);
SubtitleListview1.SetDuration(index, p);
SubtitleListview1.SetStartTimeAndDuration(index, p);
SetDurationInSeconds(_subtitle.Paragraphs[index].Duration.TotalSeconds + 0.001);
if (next != null)

2
src/Logic/SubtitleFormats/SubtitleFormat.cs
View File

@ -305,7 +305,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
public bool IsVobSubIndexFile
{
get { return Extension == new Idx().Extension; }
get { return string.CompareOrdinal(Extension, ".idx") == 0; }
}
public virtual void RemoveNativeFormatting(Subtitle subtitle, SubtitleFormat newFormat)