Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-24 04:02:36 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2143 from ivandrofly/visual_sync

Browse Source 
[VisualSync] - Fixes #2134.
This commit is contained in:
Nikolaj Olsson 2016-12-12 16:24:44 +01:00 committed by GitHub
commit c8b98560e7
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/Forms/VisualSync.cs
View File

@ -399,27 +399,31 @@ namespace Nikse.SubtitleEdit.Forms
private void ButtonSyncClick(object sender, EventArgs e)
{
double startPos = MediaPlayerStart.CurrentPosition;
double endPos = MediaPlayerEnd.CurrentPosition;
if (!(endPos > startPos))
// Video player current start and end position.
double videoPlayerCurrentStartPos = MediaPlayerStart.CurrentPosition;
double videoPlayerCurrentEndPos = MediaPlayerEnd.CurrentPosition;
// Subtitle start and end time in seconds.
double subStart = _paragraphs[comboBoxStartTexts.SelectedIndex].StartTime.TotalMilliseconds / TimeCode.BaseUnit;
double subEnd = _paragraphs[comboBoxEndTexts.SelectedIndex].StartTime.TotalMilliseconds / TimeCode.BaseUnit;
// Both end times must be greater than start time.
if (!(videoPlayerCurrentEndPos > videoPlayerCurrentStartPos && subEnd > videoPlayerCurrentStartPos))
{
MessageBox.Show(_language.StartSceneMustComeBeforeEndScene, "", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
return;
}
SetSyncFactorLabel();
double subStart = _paragraphs[comboBoxStartTexts.SelectedIndex].StartTime.TotalMilliseconds / TimeCode.BaseUnit;
double subEnd = _paragraphs[comboBoxEndTexts.SelectedIndex].StartTime.TotalMilliseconds / TimeCode.BaseUnit;
SetSyncFactorLabel(videoPlayerCurrentStartPos, videoPlayerCurrentEndPos);
double subDiff = subEnd - subStart;
double realDiff = endPos - startPos;
double realDiff = videoPlayerCurrentEndPos - videoPlayerCurrentStartPos;
// speed factor
double factor = realDiff / subDiff;
// adjust to starting position
double adjust = startPos - subStart * factor;
double adjust = videoPlayerCurrentStartPos - subStart * factor;
foreach (Paragraph p in _paragraphs)
{
@ -752,27 +756,25 @@ namespace Nikse.SubtitleEdit.Forms
timerProgressBarRefresh.Start();
}
private void SetSyncFactorLabel()
private void SetSyncFactorLabel(double videoPlayerCurrentStartPos, double videoPlayerCurrentEndPos)
{
_adjustInfo = string.Empty;
if (string.IsNullOrWhiteSpace(VideoFileName))
return;
double startPos = MediaPlayerStart.CurrentPosition;
double endPos = MediaPlayerEnd.CurrentPosition;
if (endPos > startPos)
_adjustInfo = string.Empty;
if (videoPlayerCurrentEndPos > videoPlayerCurrentStartPos)
{
double subStart = _paragraphs[comboBoxStartTexts.SelectedIndex].StartTime.TotalMilliseconds / TimeCode.BaseUnit;
double subEnd = _paragraphs[comboBoxEndTexts.SelectedIndex].StartTime.TotalMilliseconds / TimeCode.BaseUnit;
double subDiff = subEnd - subStart;
double realDiff = endPos - startPos;
double realDiff = videoPlayerCurrentEndPos - videoPlayerCurrentStartPos;
// speed factor
double factor = realDiff / subDiff;
// adjust to starting position
double adjust = startPos - subStart * factor;
double adjust = videoPlayerCurrentStartPos - subStart * factor;
if (Math.Abs(adjust) > 0.001 || (Math.Abs(1 - factor)) > 0.001)
_adjustInfo = string.Format("*{0:0.000}, {1:+0.000;-0.000}", factor, adjust);