From a793d25b6e2ea50d53c1cc687042ddd6d17adf0c Mon Sep 17 00:00:00 2001 From: OmrSi Date: Fri, 15 Oct 2021 12:13:07 +0300 Subject: [PATCH] Fix the existence of two properties for Smpte --- src/ui/Controls/VideoPlayerContainer.cs | 5 +---- src/ui/Forms/BinaryEdit/BinEdit.Designer.cs | 1 - src/ui/Forms/HardSubExtract.Designer.cs | 1 - src/ui/Forms/Main.Designer.cs | 1 - src/ui/Forms/Main.cs | 13 +++++++++---- src/ui/Forms/SetSyncPoint.Designer.cs | 1 - src/ui/Forms/VisualSync.Designer.cs | 2 -- 7 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/ui/Controls/VideoPlayerContainer.cs b/src/ui/Controls/VideoPlayerContainer.cs index 0920f5f8e..ffca74df0 100644 --- a/src/ui/Controls/VideoPlayerContainer.cs +++ b/src/ui/Controls/VideoPlayerContainer.cs @@ -201,7 +201,6 @@ namespace Nikse.SubtitleEdit.Controls public VideoPlayerContainer() { _chapters = new List(); - SmpteMode = false; FontSizeFactor = 1.0F; BorderStyle = BorderStyle.None; _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 /// https://backlothelp.netflix.com/hc/en-us/articles/215131928-How-do-I-know-whether-to-select-SMPTE-or-MEDIA-for-a-timing-reference- /// - public bool SmpteMode { get; set; } + public bool SmpteMode => Configuration.Settings.General.CurrentVideoIsSmpte; public void RefreshProgressBar() { @@ -2132,7 +2131,6 @@ namespace Nikse.SubtitleEdit.Controls DeleteTempMpvFileName(); base.Dispose(disposing); _retryCount = 3; - SmpteMode = false; } public void PauseAndDisposePlayer() @@ -2156,7 +2154,6 @@ namespace Nikse.SubtitleEdit.Controls DeleteTempMpvFileName(); _retryCount = 3; - SmpteMode = false; RefreshProgressBar(); } diff --git a/src/ui/Forms/BinaryEdit/BinEdit.Designer.cs b/src/ui/Forms/BinaryEdit/BinEdit.Designer.cs index 3c1f5f0d7..7ccb9ca75 100644 --- a/src/ui/Forms/BinaryEdit/BinEdit.Designer.cs +++ b/src/ui/Forms/BinaryEdit/BinEdit.Designer.cs @@ -888,7 +888,6 @@ namespace Nikse.SubtitleEdit.Forms.BinaryEdit this.videoPlayerContainer1.ShowMuteButton = true; this.videoPlayerContainer1.ShowStopButton = true; this.videoPlayerContainer1.Size = new System.Drawing.Size(584, 333); - this.videoPlayerContainer1.SmpteMode = false; this.videoPlayerContainer1.SubtitleText = ""; this.videoPlayerContainer1.TabIndex = 16; this.videoPlayerContainer1.TextRightToLeft = System.Windows.Forms.RightToLeft.No; diff --git a/src/ui/Forms/HardSubExtract.Designer.cs b/src/ui/Forms/HardSubExtract.Designer.cs index 55ac62ef8..938fc058b 100644 --- a/src/ui/Forms/HardSubExtract.Designer.cs +++ b/src/ui/Forms/HardSubExtract.Designer.cs @@ -358,7 +358,6 @@ this.mediaPlayer.ShowMuteButton = true; this.mediaPlayer.ShowStopButton = true; this.mediaPlayer.Size = new System.Drawing.Size(503, 247); - this.mediaPlayer.SmpteMode = false; this.mediaPlayer.SubtitleText = ""; this.mediaPlayer.TabIndex = 23; this.mediaPlayer.TextRightToLeft = System.Windows.Forms.RightToLeft.No; diff --git a/src/ui/Forms/Main.Designer.cs b/src/ui/Forms/Main.Designer.cs index 9d99032e5..c4ac3a7e3 100644 --- a/src/ui/Forms/Main.Designer.cs +++ b/src/ui/Forms/Main.Designer.cs @@ -5345,7 +5345,6 @@ namespace Nikse.SubtitleEdit.Forms this.mediaPlayer.ShowMuteButton = true; this.mediaPlayer.ShowStopButton = true; this.mediaPlayer.Size = new System.Drawing.Size(219, 246); - this.mediaPlayer.SmpteMode = false; this.mediaPlayer.SubtitleText = ""; this.mediaPlayer.TabIndex = 5; this.mediaPlayer.TextRightToLeft = System.Windows.Forms.RightToLeft.No; diff --git a/src/ui/Forms/Main.cs b/src/ui/Forms/Main.cs index 9de140740..2e3c4a745 100644 --- a/src/ui/Forms/Main.cs +++ b/src/ui/Forms/Main.cs @@ -4075,10 +4075,16 @@ namespace Nikse.SubtitleEdit.Forms } } - Configuration.Settings.General.CurrentVideoIsSmpte = rfe.VideoIsSmpte; if (rfe.VideoIsSmpte) { - SmpteTimeModedropFrameToolStripMenuItem_Click(null, null); + if (!smpteTimeModedropFrameToolStripMenuItem.Checked) + { + SmpteTimeModedropFrameToolStripMenuItem_Click(null, null); + } + else + { + Configuration.Settings.General.CurrentVideoIsSmpte = true; + } } } @@ -25990,7 +25996,7 @@ namespace Nikse.SubtitleEdit.Forms 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) && @@ -30544,7 +30550,6 @@ namespace Nikse.SubtitleEdit.Forms private void SmpteTimeModedropFrameToolStripMenuItem_Click(object sender, EventArgs e) { smpteTimeModedropFrameToolStripMenuItem.Checked = !smpteTimeModedropFrameToolStripMenuItem.Checked; - mediaPlayer.SmpteMode = smpteTimeModedropFrameToolStripMenuItem.Checked; Configuration.Settings.General.CurrentVideoIsSmpte = smpteTimeModedropFrameToolStripMenuItem.Checked; if (audioVisualizer.WavePeaks != null) { diff --git a/src/ui/Forms/SetSyncPoint.Designer.cs b/src/ui/Forms/SetSyncPoint.Designer.cs index 39aa635a2..c735cf357 100644 --- a/src/ui/Forms/SetSyncPoint.Designer.cs +++ b/src/ui/Forms/SetSyncPoint.Designer.cs @@ -261,7 +261,6 @@ namespace Nikse.SubtitleEdit.Forms this.videoPlayerContainer1.ShowMuteButton = true; this.videoPlayerContainer1.ShowStopButton = true; this.videoPlayerContainer1.Size = new System.Drawing.Size(779, 263); - this.videoPlayerContainer1.SmpteMode = false; this.videoPlayerContainer1.SubtitleText = ""; this.videoPlayerContainer1.TabIndex = 13; this.videoPlayerContainer1.TextRightToLeft = System.Windows.Forms.RightToLeft.No; diff --git a/src/ui/Forms/VisualSync.Designer.cs b/src/ui/Forms/VisualSync.Designer.cs index d89e77db4..fe80aaec0 100644 --- a/src/ui/Forms/VisualSync.Designer.cs +++ b/src/ui/Forms/VisualSync.Designer.cs @@ -117,7 +117,6 @@ namespace Nikse.SubtitleEdit.Forms this.MediaPlayerStart.ShowMuteButton = true; this.MediaPlayerStart.ShowStopButton = true; this.MediaPlayerStart.Size = new System.Drawing.Size(450, 287); - this.MediaPlayerStart.SmpteMode = false; this.MediaPlayerStart.SubtitleText = ""; this.MediaPlayerStart.TabIndex = 13; this.MediaPlayerStart.TextRightToLeft = System.Windows.Forms.RightToLeft.No; @@ -225,7 +224,6 @@ namespace Nikse.SubtitleEdit.Forms this.MediaPlayerEnd.ShowMuteButton = true; this.MediaPlayerEnd.ShowStopButton = true; this.MediaPlayerEnd.Size = new System.Drawing.Size(438, 287); - this.MediaPlayerEnd.SmpteMode = false; this.MediaPlayerEnd.SubtitleText = ""; this.MediaPlayerEnd.TabIndex = 14; this.MediaPlayerEnd.TextRightToLeft = System.Windows.Forms.RightToLeft.No;