Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2025-01-31 21:11:39 +01:00
Code Issues Projects Releases Wiki Activity

Formatting (whitespace only)

Browse Source
This commit is contained in:
Waldi Ravens 2016-03-05 18:45:42 +01:00
parent 6eb69e2c15
commit 7db68544bc
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libse/SubtitleFormats/TimedText.cs
View File

@ -266,7 +266,6 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
} }
else else
{ {
subtitle.Paragraphs.Add(new Paragraph(TimedText10.GetTimeCode(start, false), TimedText10.GetTimeCode(end, false), text)); subtitle.Paragraphs.Add(new Paragraph(TimedText10.GetTimeCode(start, false), TimedText10.GetTimeCode(end, false), text));
} }
} }

2
libse/SubtitleFormats/UnknownSubtitle82.cs
View File

@ -35,7 +35,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
<timedtext format='3'> <timedtext format='3'>
<body /> <body />
</timedtext>"; </timedtext>";
var xml = new XmlDocument(); var xml = new XmlDocument();
xml.LoadXml(xmpTemplate.Replace('\'', '"')); xml.LoadXml(xmpTemplate.Replace('\'', '"'));
var paragraphInsertNode = xml.DocumentElement.SelectSingleNode("body"); var paragraphInsertNode = xml.DocumentElement.SelectSingleNode("body");

2
src/Controls/VideoPlayerContainer.cs
View File

@ -350,7 +350,7 @@ namespace Nikse.SubtitleEdit.Controls
{ {
string f = s.Substring(0, end); string f = s.Substring(0, end);
int colorStart = f.IndexOf(" color=", StringComparison.Ordinal); int colorStart = f.IndexOf(" color=", StringComparison.Ordinal);
if (colorStart > 0) if (colorStart > 0)
{ {
int colorEnd = colorStart + " color=".Length + 1; int colorEnd = colorStart + " color=".Length + 1;

2
src/Forms/SettingsMpv.cs
View File

@ -24,7 +24,7 @@ namespace Nikse.SubtitleEdit.Forms
{ {
if (e.Error != null ) if (e.Error != null )
{ {
MessageBox.Show(Configuration.Settings.Language.SettingsMpv.DownloadMpvFailed); MessageBox.Show(Configuration.Settings.Language.SettingsMpv.DownloadMpvFailed);
labelPleaseWait.Text = string.Empty; labelPleaseWait.Text = string.Empty;
buttonOK.Enabled = true; buttonOK.Enabled = true;
buttonDownload.Enabled = true; buttonDownload.Enabled = true;

11
src/Logic/VideoPlayers/libMpvDynamic.cs
View File

@ -160,7 +160,7 @@ namespace Nikse.SubtitleEdit.Logic.VideoPlayers
{ {
get get
{ {
return _playRate; return _playRate;
} }
set set
{ {
@ -261,7 +261,7 @@ namespace Nikse.SubtitleEdit.Logic.VideoPlayers
} }
} }
} }
return _audioTrackIds.Count; return _audioTrackIds.Count;
} }
} }
@ -272,7 +272,7 @@ namespace Nikse.SubtitleEdit.Logic.VideoPlayers
int mpvFormatString = 1; int mpvFormatString = 1;
IntPtr lpBuffer = Marshal.AllocHGlobal(10); IntPtr lpBuffer = Marshal.AllocHGlobal(10);
_mpvGetPropertyString(_mpvHandle, Encoding.UTF8.GetBytes("aid\0"), mpvFormatString, ref lpBuffer); _mpvGetPropertyString(_mpvHandle, Encoding.UTF8.GetBytes("aid\0"), mpvFormatString, ref lpBuffer);
string str = Marshal.PtrToStringAnsi(lpBuffer); string str = Marshal.PtrToStringAnsi(lpBuffer);
if (AudioTrackCount > 1 && _audioTrackIds.Contains(str)) if (AudioTrackCount > 1 && _audioTrackIds.Contains(str))
{ {
return _audioTrackIds.IndexOf(str); return _audioTrackIds.IndexOf(str);
@ -344,10 +344,10 @@ namespace Nikse.SubtitleEdit.Logic.VideoPlayers
{ {
_mpvInitialize.Invoke(_mpvHandle); _mpvInitialize.Invoke(_mpvHandle);
string videoOutput = "direct3d_shaders"; string videoOutput = "direct3d_shaders";
if (!string.IsNullOrWhiteSpace(Configuration.Settings.General.MpvVideoOutput)) if (!string.IsNullOrWhiteSpace(Configuration.Settings.General.MpvVideoOutput))
videoOutput = Configuration.Settings.General.MpvVideoOutput; videoOutput = Configuration.Settings.General.MpvVideoOutput;
_mpvSetOptionString(_mpvHandle, Encoding.UTF8.GetBytes("vo\0"), Encoding.UTF8.GetBytes(videoOutput + "\0")); // "direct3d_shaders" is default, "direct3d" could be used for compabality with old systems _mpvSetOptionString(_mpvHandle, Encoding.UTF8.GetBytes("vo\0"), Encoding.UTF8.GetBytes(videoOutput + "\0")); // "direct3d_shaders" is default, "direct3d" could be used for compabality with old systems
_mpvSetOptionString(_mpvHandle, Encoding.UTF8.GetBytes("keep-open\0"), Encoding.UTF8.GetBytes("always\0")); // don't auto close video _mpvSetOptionString(_mpvHandle, Encoding.UTF8.GetBytes("keep-open\0"), Encoding.UTF8.GetBytes("always\0")); // don't auto close video
_mpvSetOptionString(_mpvHandle, Encoding.UTF8.GetBytes("no-sub\0"), Encoding.UTF8.GetBytes("\0")); // don't load subtitles _mpvSetOptionString(_mpvHandle, Encoding.UTF8.GetBytes("no-sub\0"), Encoding.UTF8.GetBytes("\0")); // don't load subtitles
@ -372,7 +372,6 @@ namespace Nikse.SubtitleEdit.Logic.VideoPlayers
int l = 0; int l = 0;
while (l < 10000) while (l < 10000)
{ {
Application.DoEvents(); Application.DoEvents();
try try
{ {