Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-23 03:33:18 +01:00
Code Issues Projects Releases Wiki Activity

Make format change + video preview text more consistant - thx Mike :)

Browse Source
This commit is contained in:
niksedk 2021-10-17 13:06:35 +02:00
parent d8f7b9a0bb
commit 45f2f272c4
6 changed files with 294 additions and 262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ui/Controls/VideoPlayerContainer.cs
View File

@ -370,7 +370,7 @@ namespace Nikse.SubtitleEdit.Controls
public Paragraph LastParagraph { get; set; }
public void SetSubtitleText(string text, Paragraph p, Subtitle subtitle)
public void SetSubtitleText(string text, Paragraph p, Subtitle subtitle, SubtitleFormat format)
{
var mpv = VideoPlayer as LibMpvDynamic;
LastParagraph = p;
@ -382,7 +382,7 @@ namespace Nikse.SubtitleEdit.Controls
VideoPlayerContainerResize(null, null);
}
_subtitleText = text;
RefreshMpv(mpv, subtitle);
RefreshMpv(mpv, subtitle, format);
if (TextBox.Text.Length > 0)
{
TextBox.Text = string.Empty;
@ -441,7 +441,7 @@ namespace Nikse.SubtitleEdit.Controls
private int _mpvSubOldHash = -1;
private string _mpvTextFileName;
private int _retryCount = 3;
private void RefreshMpv(LibMpvDynamic mpv, Subtitle subtitle)
private void RefreshMpv(LibMpvDynamic mpv, Subtitle subtitle, SubtitleFormat uiFormat)
{
if (subtitle == null)
{
@ -469,7 +469,7 @@ namespace Nikse.SubtitleEdit.Controls
}
else
{
if (subtitle.Header == null || !subtitle.Header.Contains("[V4+ Styles]"))
if (subtitle.Header == null || !subtitle.Header.Contains("[V4+ Styles]") || uiFormat.Name != AdvancedSubStationAlpha.NameOfFormat)
{
if (subtitle.Header != null && subtitle.Header.Contains("[V4 Styles]"))
{

5
src/ui/Forms/Assa/AssaProgressBar.cs
View File

@ -668,13 +668,14 @@ Dialogue: -255,0:00:00.00,0:43:00.00,SE-progress-bar-bg,,0,0,0,,[PB_DRAWING]";
}
}
textBoxSource.Text = new AdvancedSubStationAlpha().ToText(_progessBarSubtitle, string.Empty);
var format = new AdvancedSubStationAlpha();
textBoxSource.Text = format.ToText(_progessBarSubtitle, string.Empty);
var hashValue = _progessBarSubtitle.GetFastHashCode(string.Empty);
if (hashValue != _oldHashValue)
{
_videoPlayerContainer.SetSubtitleText(string.Empty, new Paragraph(), _progessBarSubtitle);
_videoPlayerContainer.SetSubtitleText(string.Empty, new Paragraph(), _progessBarSubtitle, format);
_oldHashValue = hashValue;
}

511
src/ui/Forms/Main.cs
View File

@ -107,6 +107,7 @@ namespace Nikse.SubtitleEdit.Forms
private bool _converted;
private bool _formatManuallyChanged;
private SubtitleFormat _oldSubtitleFormat;
private SubtitleFormat _currentSubtitleFormat;
private List<int> _selectedIndices;
private LanguageStructure.Main _language;
private LanguageStructure.General _languageGeneral;
@ -235,8 +236,11 @@ namespace Nikse.SubtitleEdit.Forms
comboBoxSubtitleFormats.SelectedIndex = index;
if (oldIdx == comboBoxSubtitleFormats.SelectedIndex)
{
var oldFormat = _currentSubtitleFormat;
_makeHistoryPaused = true;
ComboBoxSubtitleFormatsSelectedIndexChanged(null, null);
_currentSubtitleFormat = format;
//ComboBoxSubtitleFormatsSelectedIndexChanged(null, null);
MakeFormatChange(oldFormat, _currentSubtitleFormat);
_makeHistoryPaused = false;
}
@ -384,7 +388,6 @@ namespace Nikse.SubtitleEdit.Forms
UpdateRecentFilesUI();
InitializeToolbar();
UpdateToolbarButtonsToCurrentFormat();
if (Configuration.Settings.General.RightToLeftMode)
{
@ -2106,13 +2109,240 @@ namespace Nikse.SubtitleEdit.Forms
private void SetFormatTo(SubtitleFormat subtitleFormat)
{
var oldFormat = _currentSubtitleFormat;
comboBoxSubtitleFormats.SelectedIndexChanged -= ComboBoxSubtitleFormatsSelectedIndexChanged;
_currentSubtitleFormat = null;
UiUtil.InitializeSubtitleFormatComboBox(comboBoxSubtitleFormats, subtitleFormat.FriendlyName);
_currentSubtitleFormat = GetCurrentSubtitleFormat();
MakeFormatChange(oldFormat, _currentSubtitleFormat);
comboBoxSubtitleFormats.SelectedIndexChanged += ComboBoxSubtitleFormatsSelectedIndexChanged;
}
private int FirstSelectedIndex =>
SubtitleListview1.SelectedItems.Count == 0 ? -1 : SubtitleListview1.SelectedItems[0].Index;
private void MakeFormatChange(SubtitleFormat currentSubtitleFormat, SubtitleFormat oldFormat)
{
var format = currentSubtitleFormat;
_converted = format != _oldSubtitleFormat;
if (format == null)
{
format = new SubRip();
}
var formatType = format.GetType();
_oldSubtitleFormat = oldFormat;
if (_oldSubtitleFormat == null)
{
if (!_loading && _lastChangedToFormat != format.FriendlyName)
{
MakeHistoryForUndo(string.Format(_language.BeforeConvertingToX, format.FriendlyName));
}
if (formatType == typeof(AdvancedSubStationAlpha))
{
SetAssaResolutionWithChecks();
}
}
else
{
if (!_makeHistoryPaused && _lastChangedToFormat != format.FriendlyName)
{
_subtitle.MakeHistoryForUndo(string.Format(_language.BeforeConvertingToX, format.FriendlyName), _lastChangedToFormat, _fileDateTime, _subtitleOriginal, _subtitleOriginalFileName, _subtitleListViewIndex, textBoxListViewText.SelectionStart, textBoxListViewTextOriginal.SelectionStart);
_undoIndex++;
if (_undoIndex > Subtitle.MaximumHistoryItems)
{
_undoIndex--;
}
}
if (_oldSubtitleFormat?.GetType() != format.GetType())
{
_oldSubtitleFormat.RemoveNativeFormatting(_subtitle, format);
}
if (formatType == typeof(AdvancedSubStationAlpha))
{
foreach (var p in _subtitle.Paragraphs)
{
p.Text = AdvancedSubStationAlpha.FormatText(p.Text);
}
}
SaveSubtitleListviewIndices();
SubtitleListview1.Fill(_subtitle, _subtitleOriginal);
RestoreSubtitleListviewIndices();
if (_oldSubtitleFormat.HasStyleSupport)
{
SubtitleListview1.HideColumn(SubtitleListView.SubtitleColumn.Extra);
}
if (_networkSession == null)
{
SubtitleListview1.HideColumn(SubtitleListView.SubtitleColumn.Network);
}
if (formatType == typeof(AdvancedSubStationAlpha))
{
if (_oldSubtitleFormat.GetType() == typeof(SubStationAlpha))
{
if (!_subtitle.Header.Contains("[V4+ Styles]"))
{
_subtitle.Header = AdvancedSubStationAlpha.GetHeaderAndStylesFromSubStationAlpha(_subtitle.Header);
foreach (var p in _subtitle.Paragraphs)
{
if (p.Extra != null)
{
p.Extra = p.Extra.TrimStart('*');
}
}
}
}
else if (_oldSubtitleFormat.GetType() == typeof(AdvancedSubStationAlpha) && string.IsNullOrEmpty(_subtitle.Header))
{
_subtitle.Header = AdvancedSubStationAlpha.DefaultHeader;
}
SetAssaResolutionWithChecks();
}
}
_lastChangedToFormat = format.FriendlyName;
UpdateSourceView();
if (_converted)
{
ShowStatus(string.Format(_language.ConvertedToX, format.FriendlyName));
}
if (!string.IsNullOrEmpty(_fileName) && _oldSubtitleFormat != null)
{
if (_fileName.Contains('.'))
{
_fileName = _fileName.Substring(0, _fileName.LastIndexOf('.')) + format.Extension;
}
else
{
_fileName += format.Extension;
}
SetTitle();
}
if ((formatType == typeof(AdvancedSubStationAlpha) ||
formatType == typeof(SubStationAlpha) ||
formatType == typeof(CsvNuendo)) && (_subtitle.Paragraphs.Any(p => !string.IsNullOrEmpty(p.Actor)) ||
Configuration.Settings.Tools.ListViewShowColumnActor))
{
bool wasVisible = SubtitleListview1.ColumnIndexActor >= 0;
if (formatType == typeof(CsvNuendo))
{
SubtitleListview1.ShowActorColumn(LanguageSettings.Current.General.Character);
}
else
{
SubtitleListview1.ShowActorColumn(LanguageSettings.Current.General.Actor);
}
if (!wasVisible)
{
SaveSubtitleListviewIndices();
SubtitleListview1.Fill(_subtitle, _subtitleOriginal);
RestoreSubtitleListviewIndices();
}
}
else
{
SubtitleListview1.HideColumn(SubtitleListView.SubtitleColumn.Actor);
}
if (formatType == typeof(TimedText10) && Configuration.Settings.Tools.ListViewShowColumnRegion)
{
SubtitleListview1.ShowRegionColumn(LanguageSettings.Current.General.Region);
}
else
{
SubtitleListview1.HideColumn(SubtitleListView.SubtitleColumn.Region);
}
if (format.HasStyleSupport)
{
var styles = new List<string>();
if (formatType == typeof(AdvancedSubStationAlpha) || formatType == typeof(SubStationAlpha))
{
styles = AdvancedSubStationAlpha.GetStylesFromHeader(_subtitle.Header);
if (styles.Count == 0)
{
styles = AdvancedSubStationAlpha.GetStylesFromHeader(AdvancedSubStationAlpha.DefaultHeader);
}
}
else if (formatType == typeof(TimedText10) || formatType == typeof(ItunesTimedText))
{
styles = TimedText10.GetStylesFromHeader(_subtitle.Header);
}
else if (formatType == typeof(Sami) || formatType == typeof(SamiModern))
{
styles = Sami.GetStylesFromHeader(_subtitle.Header);
if (string.IsNullOrEmpty(_subtitle.Header))
{
styles = Sami.GetStylesFromSubtitle(_subtitle);
}
else
{
styles = Sami.GetStylesFromHeader(_subtitle.Header);
}
}
else if (format.Name == "Nuendo")
{
styles = GetNuendoStyles();
}
if (styles.Count > 0)
{
foreach (var p in _subtitle.Paragraphs)
{
if (string.IsNullOrEmpty(p.Extra))
{
p.Extra = styles[0];
}
}
}
if (formatType == typeof(Sami) || formatType == typeof(SamiModern))
{
SubtitleListview1.ShowExtraColumn(_languageGeneral.Class);
}
else if (formatType == typeof(TimedText10) || formatType == typeof(ItunesTimedText))
{
SubtitleListview1.ShowExtraColumn(_languageGeneral.StyleLanguage);
}
else if (format.Name == "Nuendo")
{
SubtitleListview1.ShowExtraColumn(_languageGeneral.Character);
}
else
{
SubtitleListview1.ShowExtraColumn(_languageGeneral.Style);
}
SaveSubtitleListviewIndices();
SubtitleListview1.Fill(_subtitle, _subtitleOriginal);
RestoreSubtitleListviewIndices();
}
else
{
SubtitleListview1.HideColumn(SubtitleListView.SubtitleColumn.Extra);
}
ShowHideTextBasedFeatures(format);
UpdateToolbarButtonsToCurrentFormat(currentSubtitleFormat);
mediaPlayer.LastParagraph = null;
UiUtil.ShowSubtitle(_subtitle, mediaPlayer, currentSubtitleFormat);
_oldSubtitleFormat = oldFormat;
}
private int FirstSelectedIndex => SubtitleListview1.SelectedItems.Count == 0 ? -1 : SubtitleListview1.SelectedItems[0].Index;
private int FirstVisibleIndex =>
SubtitleListview1.Items.Count == 0 || SubtitleListview1.TopItem == null ? -1 : SubtitleListview1.TopItem.Index;
@ -4802,227 +5032,13 @@ namespace Nikse.SubtitleEdit.Forms
private void ComboBoxSubtitleFormatsSelectedIndexChanged(object sender, EventArgs e)
{
if (IsMenuOpen)
var newFormat = Utilities.GetSubtitleFormatByFriendlyName(comboBoxSubtitleFormats.SelectedItem.ToString());
if (newFormat.Name != _currentSubtitleFormat?.Name)
{
return;
var oldFormat = _currentSubtitleFormat;
_currentSubtitleFormat = newFormat;
MakeFormatChange(newFormat, oldFormat);
}
var format = GetCurrentSubtitleFormat();
_converted = format != _oldSubtitleFormat;
if (format == null)
{
format = new SubRip();
}
var formatType = format.GetType();
if (_oldSubtitleFormat == null)
{
if (!_loading && _lastChangedToFormat != format.FriendlyName)
{
MakeHistoryForUndo(string.Format(_language.BeforeConvertingToX, format.FriendlyName));
}
if (formatType == typeof(AdvancedSubStationAlpha))
{
SetAssaResolutionWithChecks();
}
}
else
{
if (!_makeHistoryPaused && _lastChangedToFormat != format.FriendlyName)
{
_subtitle.MakeHistoryForUndo(string.Format(_language.BeforeConvertingToX, format.FriendlyName), _lastChangedToFormat, _fileDateTime, _subtitleOriginal, _subtitleOriginalFileName, _subtitleListViewIndex, textBoxListViewText.SelectionStart, textBoxListViewTextOriginal.SelectionStart);
_undoIndex++;
if (_undoIndex > Subtitle.MaximumHistoryItems)
{
_undoIndex--;
}
}
if (_oldSubtitleFormat?.GetType() != format.GetType())
{
_oldSubtitleFormat.RemoveNativeFormatting(_subtitle, format);
}
if (formatType == typeof(AdvancedSubStationAlpha))
{
foreach (var p in _subtitle.Paragraphs)
{
p.Text = AdvancedSubStationAlpha.FormatText(p.Text);
}
}
SaveSubtitleListviewIndices();
SubtitleListview1.Fill(_subtitle, _subtitleOriginal);
RestoreSubtitleListviewIndices();
if (_oldSubtitleFormat.HasStyleSupport)
{
SubtitleListview1.HideColumn(SubtitleListView.SubtitleColumn.Extra);
}
if (_networkSession == null)
{
SubtitleListview1.HideColumn(SubtitleListView.SubtitleColumn.Network);
}
if (formatType == typeof(AdvancedSubStationAlpha))
{
if (_oldSubtitleFormat.GetType() == typeof(SubStationAlpha))
{
if (!_subtitle.Header.Contains("[V4+ Styles]"))
{
_subtitle.Header = AdvancedSubStationAlpha.GetHeaderAndStylesFromSubStationAlpha(_subtitle.Header);
foreach (var p in _subtitle.Paragraphs)
{
if (p.Extra != null)
{
p.Extra = p.Extra.TrimStart('*');
}
}
}
}
else if (_oldSubtitleFormat.GetType() == typeof(AdvancedSubStationAlpha) && string.IsNullOrEmpty(_subtitle.Header))
{
_subtitle.Header = AdvancedSubStationAlpha.DefaultHeader;
}
SetAssaResolutionWithChecks();
}
}
_lastChangedToFormat = format.FriendlyName;
UpdateSourceView();
if (_converted)
{
ShowStatus(string.Format(_language.ConvertedToX, format.FriendlyName));
}
if (!string.IsNullOrEmpty(_fileName) && _oldSubtitleFormat != null)
{
if (_fileName.Contains('.'))
{
_fileName = _fileName.Substring(0, _fileName.LastIndexOf('.')) + format.Extension;
}
else
{
_fileName += format.Extension;
}
SetTitle();
}
if ((formatType == typeof(AdvancedSubStationAlpha) ||
formatType == typeof(SubStationAlpha) ||
formatType == typeof(CsvNuendo)) && (_subtitle.Paragraphs.Any(p => !string.IsNullOrEmpty(p.Actor)) ||
Configuration.Settings.Tools.ListViewShowColumnActor))
{
bool wasVisible = SubtitleListview1.ColumnIndexActor >= 0;
if (formatType == typeof(CsvNuendo))
{
SubtitleListview1.ShowActorColumn(LanguageSettings.Current.General.Character);
}
else
{
SubtitleListview1.ShowActorColumn(LanguageSettings.Current.General.Actor);
}
if (!wasVisible)
{
SaveSubtitleListviewIndices();
SubtitleListview1.Fill(_subtitle, _subtitleOriginal);
RestoreSubtitleListviewIndices();
}
}
else
{
SubtitleListview1.HideColumn(SubtitleListView.SubtitleColumn.Actor);
}
if (formatType == typeof(TimedText10) && Configuration.Settings.Tools.ListViewShowColumnRegion)
{
SubtitleListview1.ShowRegionColumn(LanguageSettings.Current.General.Region);
}
else
{
SubtitleListview1.HideColumn(SubtitleListView.SubtitleColumn.Region);
}
if (format.HasStyleSupport)
{
var styles = new List<string>();
if (formatType == typeof(AdvancedSubStationAlpha) || formatType == typeof(SubStationAlpha))
{
styles = AdvancedSubStationAlpha.GetStylesFromHeader(_subtitle.Header);
if (styles.Count == 0)
{
styles = AdvancedSubStationAlpha.GetStylesFromHeader(AdvancedSubStationAlpha.DefaultHeader);
}
}
else if (formatType == typeof(TimedText10) || formatType == typeof(ItunesTimedText))
{
styles = TimedText10.GetStylesFromHeader(_subtitle.Header);
}
else if (formatType == typeof(Sami) || formatType == typeof(SamiModern))
{
styles = Sami.GetStylesFromHeader(_subtitle.Header);
if (string.IsNullOrEmpty(_subtitle.Header))
{
styles = Sami.GetStylesFromSubtitle(_subtitle);
}
else
{
styles = Sami.GetStylesFromHeader(_subtitle.Header);
}
}
else if (format.Name == "Nuendo")
{
styles = GetNuendoStyles();
}
if (styles.Count > 0)
{
foreach (var p in _subtitle.Paragraphs)
{
if (string.IsNullOrEmpty(p.Extra))
{
p.Extra = styles[0];
}
}
}
if (formatType == typeof(Sami) || formatType == typeof(SamiModern))
{
SubtitleListview1.ShowExtraColumn(_languageGeneral.Class);
}
else if (formatType == typeof(TimedText10) || formatType == typeof(ItunesTimedText))
{
SubtitleListview1.ShowExtraColumn(_languageGeneral.StyleLanguage);
}
else if (format.Name == "Nuendo")
{
SubtitleListview1.ShowExtraColumn(_languageGeneral.Character);
}
else
{
SubtitleListview1.ShowExtraColumn(_languageGeneral.Style);
}
SaveSubtitleListviewIndices();
SubtitleListview1.Fill(_subtitle, _subtitleOriginal);
RestoreSubtitleListviewIndices();
}
else
{
SubtitleListview1.HideColumn(SubtitleListView.SubtitleColumn.Extra);
}
ShowHideTextBasedFeatures(format);
UpdateToolbarButtonsToCurrentFormat();
_oldSubtitleFormat = format;
}
private static List<string> GetNuendoStyles()
@ -5037,7 +5053,13 @@ namespace Nikse.SubtitleEdit.Forms
private SubtitleFormat GetCurrentSubtitleFormat()
{
return Utilities.GetSubtitleFormatByFriendlyName(comboBoxSubtitleFormats.SelectedItem.ToString());
if (_currentSubtitleFormat == null)
{
_currentSubtitleFormat = Utilities.GetSubtitleFormatByFriendlyName(comboBoxSubtitleFormats.SelectedItem.ToString());
MakeFormatChange(null, _currentSubtitleFormat);
}
return _currentSubtitleFormat;
}
private void ShowSource()
@ -5446,7 +5468,7 @@ namespace Nikse.SubtitleEdit.Forms
SubtitleListview1.SyntaxColorAllLines(_subtitle);
mediaPlayer.LastParagraph = null;
Application.DoEvents();
UiUtil.ShowSubtitle(_subtitle, mediaPlayer);
UiUtil.ShowSubtitle(_subtitle, mediaPlayer, GetCurrentSubtitleFormat());
mediaPlayer.VideoPlayerContainerResize(null, null);
ShowLineInformationListView();
ShowSourceLineNumber();
@ -5530,17 +5552,19 @@ namespace Nikse.SubtitleEdit.Forms
private int ShowSubtitle()
{
var format = GetCurrentSubtitleFormat();
if (_splitDualSami)
{
return UiUtil.ShowSubtitle(_subtitle, _subtitleOriginal, mediaPlayer);
return UiUtil.ShowSubtitle(_subtitle, _subtitleOriginal, mediaPlayer, format);
}
if (SubtitleListview1.IsOriginalTextColumnVisible && Configuration.Settings.General.ShowOriginalAsPreviewIfAvailable)
{
return UiUtil.ShowSubtitle(_subtitleOriginal, mediaPlayer);
return UiUtil.ShowSubtitle(_subtitleOriginal, mediaPlayer, format);
}
return UiUtil.ShowSubtitle(_subtitle, mediaPlayer);
return UiUtil.ShowSubtitle(_subtitle, mediaPlayer, format);
}
private static void TryLoadIcon(ToolStripButton button, string iconName)
@ -5572,7 +5596,7 @@ namespace Nikse.SubtitleEdit.Forms
TryLoadIcon(toolStripButtonAssStyleManager, "AssaStyle");
TryLoadIcon(toolStripButtonAssProperties, "AssaProperties");
TryLoadIcon(toolStripButtonAssAttachments, "AssaAttachments");
TryLoadIcon(toolStripButtonAssAttachments, "AssaDraw");
TryLoadIcon(toolStripButtonAssaDraw, "AssaDraw");
TryLoadIcon(toolStripButtonSettings, "Settings");
TryLoadIcon(toolStripButtonHelp, "Help");
TryLoadIcon(toolStripButtonToggleWaveform, "WaveformToggle");
@ -5607,7 +5631,7 @@ namespace Nikse.SubtitleEdit.Forms
gs.ShowToolbarFixCommonErrors || gs.ShowToolbarVisualSync || gs.ShowToolbarSpellCheck || gs.ShowToolbarNetflixGlyphCheck ||
gs.ShowToolbarSettings || gs.ShowToolbarHelp;
UpdateToolbarButtonsToCurrentFormat();
UpdateToolbarButtonsToCurrentFormat(GetCurrentSubtitleFormat());
}
private void ToolStripButtonFileNewClick(object sender, EventArgs e)
@ -15542,7 +15566,7 @@ namespace Nikse.SubtitleEdit.Forms
}
mediaPlayer.VideoPlayer = mediaPlayer.VideoPlayer;
mediaPlayer.SetSubtitleText(string.Empty, null, _subtitle);
mediaPlayer.SetSubtitleText(string.Empty, null, _subtitle, GetCurrentSubtitleFormat());
ShowSubtitle();
}
@ -16087,7 +16111,7 @@ namespace Nikse.SubtitleEdit.Forms
_playSelectionIndex = -1;
_endSecondsNewPosition = startSeconds;
mediaPlayer.CurrentPosition = startSeconds;
UiUtil.ShowSubtitle(_subtitle, mediaPlayer);
UiUtil.ShowSubtitle(_subtitle, mediaPlayer, GetCurrentSubtitleFormat());
mediaPlayer.Play();
_endSecondsNewPositionTicks = DateTime.UtcNow.Ticks;
}
@ -16103,7 +16127,7 @@ namespace Nikse.SubtitleEdit.Forms
_playSelectionIndex = -1;
_endSecondsNewPosition = startSeconds;
mediaPlayer.CurrentPosition = startSeconds;
UiUtil.ShowSubtitle(_subtitle, mediaPlayer);
UiUtil.ShowSubtitle(_subtitle, mediaPlayer, GetCurrentSubtitleFormat());
mediaPlayer.Play();
_endSecondsNewPositionTicks = DateTime.UtcNow.Ticks;
}
@ -20720,7 +20744,7 @@ namespace Nikse.SubtitleEdit.Forms
{
_endSeconds = p.EndTime.TotalSeconds;
mediaPlayer.CurrentPosition = p.StartTime.TotalSeconds;
UiUtil.ShowSubtitle(_subtitle, mediaPlayer);
UiUtil.ShowSubtitle(_subtitle, mediaPlayer, GetCurrentSubtitleFormat());
mediaPlayer.Play();
_playSelectionIndex = nextIndex;
}
@ -24309,7 +24333,7 @@ namespace Nikse.SubtitleEdit.Forms
}
mediaPlayer.CurrentPosition = startSeconds;
UiUtil.ShowSubtitle(_subtitle, mediaPlayer);
UiUtil.ShowSubtitle(_subtitle, mediaPlayer, GetCurrentSubtitleFormat());
mediaPlayer.Play();
}
}
@ -28111,8 +28135,8 @@ namespace Nikse.SubtitleEdit.Forms
if (mediaPlayer != null && mediaPlayer.VideoPlayer is LibMpvDynamic libMpv)
{
// refresh mpv text
mediaPlayer.SetSubtitleText("", new Paragraph(), new Subtitle());
UiUtil.ShowSubtitle(_subtitle, mediaPlayer);
mediaPlayer.SetSubtitleText("", new Paragraph(), new Subtitle(), GetCurrentSubtitleFormat());
UiUtil.ShowSubtitle(_subtitle, mediaPlayer, GetCurrentSubtitleFormat());
}
}
@ -28358,7 +28382,7 @@ namespace Nikse.SubtitleEdit.Forms
}
mediaPlayer.LastParagraph = null;
UiUtil.ShowSubtitle(_subtitle, mediaPlayer);
UiUtil.ShowSubtitle(_subtitle, mediaPlayer, GetCurrentSubtitleFormat());
}
public void ApplySsaStyles(StylesForm styles)
@ -28969,7 +28993,7 @@ namespace Nikse.SubtitleEdit.Forms
{
form.ShowDialog(this);
LoadPlugins();
UpdateToolbarButtonsToCurrentFormat();
UpdateToolbarButtonsToCurrentFormat(GetCurrentSubtitleFormat());
}
}
@ -30341,9 +30365,14 @@ namespace Nikse.SubtitleEdit.Forms
IsMenuOpen = false;
}
private void UpdateToolbarButtonsToCurrentFormat()
private void UpdateToolbarButtonsToCurrentFormat(SubtitleFormat currentSubtitleFormat)
{
var formatType = GetCurrentSubtitleFormat().GetType();
if (currentSubtitleFormat == null)
{
return;
}
var formatType = currentSubtitleFormat.GetType();
var netflixIconOn = formatType == typeof(TimedText10) || formatType == typeof(NetflixTimedText) || formatType == typeof(NetflixImsc11Japanese) || formatType == typeof(Ebu);
toolStripButtonNetflixQualityCheck.Visible = netflixIconOn && Configuration.Settings.General.ShowToolbarNetflixGlyphCheck;

3
src/ui/Forms/SetSyncPoint.cs
View File

@ -1,4 +1,5 @@
using Nikse.SubtitleEdit.Core.Common;
using Nikse.SubtitleEdit.Core.SubtitleFormats;
using Nikse.SubtitleEdit.Logic;
using Nikse.SubtitleEdit.Logic.VideoPlayers;
using System;
@ -206,7 +207,7 @@ namespace Nikse.SubtitleEdit.Forms
}
if (Math.Abs(pos - _lastPosition) > 0.01)
{
UiUtil.ShowSubtitle(_subtitle, videoPlayerContainer1);
UiUtil.ShowSubtitle(_subtitle, videoPlayerContainer1, new SubRip());
timeUpDownLine.TimeCode = TimeCode.FromSeconds(pos);
_lastPosition = pos;
}

7
src/ui/Forms/VisualSync.cs
View File

@ -1,6 +1,7 @@
using Nikse.SubtitleEdit.Controls;
using Nikse.SubtitleEdit.Core.Common;
using Nikse.SubtitleEdit.Core.Forms.FixCommonErrors;
using Nikse.SubtitleEdit.Core.SubtitleFormats;
using Nikse.SubtitleEdit.Logic;
using Nikse.SubtitleEdit.Logic.VideoPlayers;
using System;
@ -253,7 +254,7 @@ namespace Nikse.SubtitleEdit.Forms
MediaPlayerStart.CurrentPosition = _startGoBackPosition;
_startStopPosition = -1;
}
UiUtil.ShowSubtitle(new Subtitle(_paragraphs), MediaPlayerStart);
UiUtil.ShowSubtitle(new Subtitle(_paragraphs), MediaPlayerStart, new SubRip());
}
if (!MediaPlayerEnd.IsPaused)
{
@ -264,7 +265,7 @@ namespace Nikse.SubtitleEdit.Forms
MediaPlayerEnd.CurrentPosition = _endGoBackPosition;
_endStopPosition = -1;
}
UiUtil.ShowSubtitle(new Subtitle(_paragraphs), MediaPlayerEnd);
UiUtil.ShowSubtitle(new Subtitle(_paragraphs), MediaPlayerEnd, new SubRip());
}
}
}
@ -508,7 +509,7 @@ namespace Nikse.SubtitleEdit.Forms
mediaPlayer.CurrentPosition = 0;
}
UiUtil.ShowSubtitle(new Subtitle(_paragraphs), mediaPlayer);
UiUtil.ShowSubtitle(new Subtitle(_paragraphs), mediaPlayer, new SubRip());
}
private void ButtonStartHalfASecondBackClick(object sender, EventArgs e)

22
src/ui/Logic/UiUtil.cs
View File

@ -69,7 +69,7 @@ namespace Nikse.SubtitleEdit.Logic
private static long _lastShowSubTicks = DateTime.UtcNow.Ticks;
private static int _lastShowSubHash;
public static int ShowSubtitle(Subtitle subtitle, VideoPlayerContainer videoPlayerContainer)
public static int ShowSubtitle(Subtitle subtitle, VideoPlayerContainer videoPlayerContainer, SubtitleFormat format)
{
if (videoPlayerContainer.VideoPlayer == null)
{
@ -89,13 +89,13 @@ namespace Nikse.SubtitleEdit.Logic
{
if (videoPlayerContainer.LastParagraph != p)
{
videoPlayerContainer.SetSubtitleText(text, p, subtitle);
videoPlayerContainer.SetSubtitleText(text, p, subtitle, format);
}
else if (videoPlayerContainer.SubtitleText != text)
{
videoPlayerContainer.SetSubtitleText(text, p, subtitle);
videoPlayerContainer.SetSubtitleText(text, p, subtitle, format);
}
TimeOutRefresh(subtitle, videoPlayerContainer, p);
TimeOutRefresh(subtitle, videoPlayerContainer, format, p);
return i;
}
}
@ -103,23 +103,23 @@ namespace Nikse.SubtitleEdit.Logic
if (!string.IsNullOrEmpty(videoPlayerContainer.SubtitleText))
{
videoPlayerContainer.SetSubtitleText(string.Empty, null, subtitle);
videoPlayerContainer.SetSubtitleText(string.Empty, null, subtitle, format);
}
else
{
TimeOutRefresh(subtitle, videoPlayerContainer);
TimeOutRefresh(subtitle, videoPlayerContainer, format);
}
return -1;
}
private static void TimeOutRefresh(Subtitle subtitle, VideoPlayerContainer videoPlayerContainer, Paragraph p = null)
private static void TimeOutRefresh(Subtitle subtitle, VideoPlayerContainer videoPlayerContainer, SubtitleFormat format, Paragraph p = null)
{
if (DateTime.UtcNow.Ticks - _lastShowSubTicks > 10000 * 1000) // more than 1+ seconds ago
{
var newHash = subtitle.GetFastHashCode(string.Empty);
if (newHash != _lastShowSubHash)
{
videoPlayerContainer.SetSubtitleText(p == null ? string.Empty : p.Text, p, subtitle);
videoPlayerContainer.SetSubtitleText(p == null ? string.Empty : p.Text, p, subtitle, format);
_lastShowSubHash = newHash;
}
@ -127,7 +127,7 @@ namespace Nikse.SubtitleEdit.Logic
}
}
public static int ShowSubtitle(Subtitle subtitle, Subtitle original, VideoPlayerContainer videoPlayerContainer)
public static int ShowSubtitle(Subtitle subtitle, Subtitle original, VideoPlayerContainer videoPlayerContainer, SubtitleFormat format)
{
if (videoPlayerContainer.VideoPlayer == null)
{
@ -153,7 +153,7 @@ namespace Nikse.SubtitleEdit.Logic
{
if (videoPlayerContainer.LastParagraph != p || videoPlayerContainer.SubtitleText != text)
{
videoPlayerContainer.SetSubtitleText(text, p, subtitle);
videoPlayerContainer.SetSubtitleText(text, p, subtitle, format);
}
return i;
}
@ -161,7 +161,7 @@ namespace Nikse.SubtitleEdit.Logic
}
if (!string.IsNullOrEmpty(videoPlayerContainer.SubtitleText))
{
videoPlayerContainer.SetSubtitleText(string.Empty, null, subtitle);
videoPlayerContainer.SetSubtitleText(string.Empty, null, subtitle, format);
}
return -1;
}