mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-28 15:02:35 +01:00
Fix the existence of two properties for Smpte
This commit is contained in:
parent
c4e907007a
commit
a793d25b6e
@ -201,7 +201,6 @@ namespace Nikse.SubtitleEdit.Controls
|
|||||||
public VideoPlayerContainer()
|
public VideoPlayerContainer()
|
||||||
{
|
{
|
||||||
_chapters = new List<MatroskaChapter>();
|
_chapters = new List<MatroskaChapter>();
|
||||||
SmpteMode = false;
|
|
||||||
FontSizeFactor = 1.0F;
|
FontSizeFactor = 1.0F;
|
||||||
BorderStyle = BorderStyle.None;
|
BorderStyle = BorderStyle.None;
|
||||||
_resources = new System.ComponentModel.ComponentResourceManager(typeof(VideoPlayerContainer));
|
_resources = new System.ComponentModel.ComponentResourceManager(typeof(VideoPlayerContainer));
|
||||||
@ -1856,7 +1855,7 @@ namespace Nikse.SubtitleEdit.Controls
|
|||||||
/// See https://blog.frame.io/2017/07/17/timecode-and-frame-rates/ and
|
/// See https://blog.frame.io/2017/07/17/timecode-and-frame-rates/ and
|
||||||
/// https://backlothelp.netflix.com/hc/en-us/articles/215131928-How-do-I-know-whether-to-select-SMPTE-or-MEDIA-for-a-timing-reference-
|
/// https://backlothelp.netflix.com/hc/en-us/articles/215131928-How-do-I-know-whether-to-select-SMPTE-or-MEDIA-for-a-timing-reference-
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool SmpteMode { get; set; }
|
public bool SmpteMode => Configuration.Settings.General.CurrentVideoIsSmpte;
|
||||||
|
|
||||||
public void RefreshProgressBar()
|
public void RefreshProgressBar()
|
||||||
{
|
{
|
||||||
@ -2132,7 +2131,6 @@ namespace Nikse.SubtitleEdit.Controls
|
|||||||
DeleteTempMpvFileName();
|
DeleteTempMpvFileName();
|
||||||
base.Dispose(disposing);
|
base.Dispose(disposing);
|
||||||
_retryCount = 3;
|
_retryCount = 3;
|
||||||
SmpteMode = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void PauseAndDisposePlayer()
|
public void PauseAndDisposePlayer()
|
||||||
@ -2156,7 +2154,6 @@ namespace Nikse.SubtitleEdit.Controls
|
|||||||
|
|
||||||
DeleteTempMpvFileName();
|
DeleteTempMpvFileName();
|
||||||
_retryCount = 3;
|
_retryCount = 3;
|
||||||
SmpteMode = false;
|
|
||||||
RefreshProgressBar();
|
RefreshProgressBar();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
1
src/ui/Forms/BinaryEdit/BinEdit.Designer.cs
generated
1
src/ui/Forms/BinaryEdit/BinEdit.Designer.cs
generated
@ -888,7 +888,6 @@ namespace Nikse.SubtitleEdit.Forms.BinaryEdit
|
|||||||
this.videoPlayerContainer1.ShowMuteButton = true;
|
this.videoPlayerContainer1.ShowMuteButton = true;
|
||||||
this.videoPlayerContainer1.ShowStopButton = true;
|
this.videoPlayerContainer1.ShowStopButton = true;
|
||||||
this.videoPlayerContainer1.Size = new System.Drawing.Size(584, 333);
|
this.videoPlayerContainer1.Size = new System.Drawing.Size(584, 333);
|
||||||
this.videoPlayerContainer1.SmpteMode = false;
|
|
||||||
this.videoPlayerContainer1.SubtitleText = "";
|
this.videoPlayerContainer1.SubtitleText = "";
|
||||||
this.videoPlayerContainer1.TabIndex = 16;
|
this.videoPlayerContainer1.TabIndex = 16;
|
||||||
this.videoPlayerContainer1.TextRightToLeft = System.Windows.Forms.RightToLeft.No;
|
this.videoPlayerContainer1.TextRightToLeft = System.Windows.Forms.RightToLeft.No;
|
||||||
|
1
src/ui/Forms/HardSubExtract.Designer.cs
generated
1
src/ui/Forms/HardSubExtract.Designer.cs
generated
@ -358,7 +358,6 @@
|
|||||||
this.mediaPlayer.ShowMuteButton = true;
|
this.mediaPlayer.ShowMuteButton = true;
|
||||||
this.mediaPlayer.ShowStopButton = true;
|
this.mediaPlayer.ShowStopButton = true;
|
||||||
this.mediaPlayer.Size = new System.Drawing.Size(503, 247);
|
this.mediaPlayer.Size = new System.Drawing.Size(503, 247);
|
||||||
this.mediaPlayer.SmpteMode = false;
|
|
||||||
this.mediaPlayer.SubtitleText = "";
|
this.mediaPlayer.SubtitleText = "";
|
||||||
this.mediaPlayer.TabIndex = 23;
|
this.mediaPlayer.TabIndex = 23;
|
||||||
this.mediaPlayer.TextRightToLeft = System.Windows.Forms.RightToLeft.No;
|
this.mediaPlayer.TextRightToLeft = System.Windows.Forms.RightToLeft.No;
|
||||||
|
1
src/ui/Forms/Main.Designer.cs
generated
1
src/ui/Forms/Main.Designer.cs
generated
@ -5345,7 +5345,6 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
this.mediaPlayer.ShowMuteButton = true;
|
this.mediaPlayer.ShowMuteButton = true;
|
||||||
this.mediaPlayer.ShowStopButton = true;
|
this.mediaPlayer.ShowStopButton = true;
|
||||||
this.mediaPlayer.Size = new System.Drawing.Size(219, 246);
|
this.mediaPlayer.Size = new System.Drawing.Size(219, 246);
|
||||||
this.mediaPlayer.SmpteMode = false;
|
|
||||||
this.mediaPlayer.SubtitleText = "";
|
this.mediaPlayer.SubtitleText = "";
|
||||||
this.mediaPlayer.TabIndex = 5;
|
this.mediaPlayer.TabIndex = 5;
|
||||||
this.mediaPlayer.TextRightToLeft = System.Windows.Forms.RightToLeft.No;
|
this.mediaPlayer.TextRightToLeft = System.Windows.Forms.RightToLeft.No;
|
||||||
|
@ -4075,11 +4075,17 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Configuration.Settings.General.CurrentVideoIsSmpte = rfe.VideoIsSmpte;
|
|
||||||
if (rfe.VideoIsSmpte)
|
if (rfe.VideoIsSmpte)
|
||||||
|
{
|
||||||
|
if (!smpteTimeModedropFrameToolStripMenuItem.Checked)
|
||||||
{
|
{
|
||||||
SmpteTimeModedropFrameToolStripMenuItem_Click(null, null);
|
SmpteTimeModedropFrameToolStripMenuItem_Click(null, null);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Configuration.Settings.General.CurrentVideoIsSmpte = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void GotoSubPosAndPause()
|
private void GotoSubPosAndPause()
|
||||||
@ -25990,7 +25996,7 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
setVideoOffsetToolStripMenuItem.Text = _language.Menu.Video.SetVideoOffset;
|
setVideoOffsetToolStripMenuItem.Text = _language.Menu.Video.SetVideoOffset;
|
||||||
}
|
}
|
||||||
|
|
||||||
smpteTimeModedropFrameToolStripMenuItem.Checked = mediaPlayer.SmpteMode;
|
smpteTimeModedropFrameToolStripMenuItem.Checked = Configuration.Settings.General.CurrentVideoIsSmpte;
|
||||||
}
|
}
|
||||||
|
|
||||||
toolStripMenuItemOpenVideoFromUrl.Enabled = Configuration.Settings.General.VideoPlayer.Trim().Equals("MPV", StringComparison.OrdinalIgnoreCase) &&
|
toolStripMenuItemOpenVideoFromUrl.Enabled = Configuration.Settings.General.VideoPlayer.Trim().Equals("MPV", StringComparison.OrdinalIgnoreCase) &&
|
||||||
@ -30544,7 +30550,6 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
private void SmpteTimeModedropFrameToolStripMenuItem_Click(object sender, EventArgs e)
|
private void SmpteTimeModedropFrameToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
smpteTimeModedropFrameToolStripMenuItem.Checked = !smpteTimeModedropFrameToolStripMenuItem.Checked;
|
smpteTimeModedropFrameToolStripMenuItem.Checked = !smpteTimeModedropFrameToolStripMenuItem.Checked;
|
||||||
mediaPlayer.SmpteMode = smpteTimeModedropFrameToolStripMenuItem.Checked;
|
|
||||||
Configuration.Settings.General.CurrentVideoIsSmpte = smpteTimeModedropFrameToolStripMenuItem.Checked;
|
Configuration.Settings.General.CurrentVideoIsSmpte = smpteTimeModedropFrameToolStripMenuItem.Checked;
|
||||||
if (audioVisualizer.WavePeaks != null)
|
if (audioVisualizer.WavePeaks != null)
|
||||||
{
|
{
|
||||||
|
1
src/ui/Forms/SetSyncPoint.Designer.cs
generated
1
src/ui/Forms/SetSyncPoint.Designer.cs
generated
@ -261,7 +261,6 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
this.videoPlayerContainer1.ShowMuteButton = true;
|
this.videoPlayerContainer1.ShowMuteButton = true;
|
||||||
this.videoPlayerContainer1.ShowStopButton = true;
|
this.videoPlayerContainer1.ShowStopButton = true;
|
||||||
this.videoPlayerContainer1.Size = new System.Drawing.Size(779, 263);
|
this.videoPlayerContainer1.Size = new System.Drawing.Size(779, 263);
|
||||||
this.videoPlayerContainer1.SmpteMode = false;
|
|
||||||
this.videoPlayerContainer1.SubtitleText = "";
|
this.videoPlayerContainer1.SubtitleText = "";
|
||||||
this.videoPlayerContainer1.TabIndex = 13;
|
this.videoPlayerContainer1.TabIndex = 13;
|
||||||
this.videoPlayerContainer1.TextRightToLeft = System.Windows.Forms.RightToLeft.No;
|
this.videoPlayerContainer1.TextRightToLeft = System.Windows.Forms.RightToLeft.No;
|
||||||
|
2
src/ui/Forms/VisualSync.Designer.cs
generated
2
src/ui/Forms/VisualSync.Designer.cs
generated
@ -117,7 +117,6 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
this.MediaPlayerStart.ShowMuteButton = true;
|
this.MediaPlayerStart.ShowMuteButton = true;
|
||||||
this.MediaPlayerStart.ShowStopButton = true;
|
this.MediaPlayerStart.ShowStopButton = true;
|
||||||
this.MediaPlayerStart.Size = new System.Drawing.Size(450, 287);
|
this.MediaPlayerStart.Size = new System.Drawing.Size(450, 287);
|
||||||
this.MediaPlayerStart.SmpteMode = false;
|
|
||||||
this.MediaPlayerStart.SubtitleText = "";
|
this.MediaPlayerStart.SubtitleText = "";
|
||||||
this.MediaPlayerStart.TabIndex = 13;
|
this.MediaPlayerStart.TabIndex = 13;
|
||||||
this.MediaPlayerStart.TextRightToLeft = System.Windows.Forms.RightToLeft.No;
|
this.MediaPlayerStart.TextRightToLeft = System.Windows.Forms.RightToLeft.No;
|
||||||
@ -225,7 +224,6 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
this.MediaPlayerEnd.ShowMuteButton = true;
|
this.MediaPlayerEnd.ShowMuteButton = true;
|
||||||
this.MediaPlayerEnd.ShowStopButton = true;
|
this.MediaPlayerEnd.ShowStopButton = true;
|
||||||
this.MediaPlayerEnd.Size = new System.Drawing.Size(438, 287);
|
this.MediaPlayerEnd.Size = new System.Drawing.Size(438, 287);
|
||||||
this.MediaPlayerEnd.SmpteMode = false;
|
|
||||||
this.MediaPlayerEnd.SubtitleText = "";
|
this.MediaPlayerEnd.SubtitleText = "";
|
||||||
this.MediaPlayerEnd.TabIndex = 14;
|
this.MediaPlayerEnd.TabIndex = 14;
|
||||||
this.MediaPlayerEnd.TextRightToLeft = System.Windows.Forms.RightToLeft.No;
|
this.MediaPlayerEnd.TextRightToLeft = System.Windows.Forms.RightToLeft.No;
|
||||||
|
Loading…
Reference in New Issue
Block a user