From 3c3c6b6f8d0ae974a5839e0b4c227310ef6a7fed Mon Sep 17 00:00:00 2001 From: Waldi Ravens Date: Fri, 17 Jul 2015 14:52:54 +0200 Subject: [PATCH] Formatting (whitespace only) --- src/Forms/DoNotBreakAfterListEdit.cs | 1 - src/Forms/DvdSubRip.cs | 3 +-- src/Forms/EffectKaraoke.cs | 4 ++-- src/Forms/GoogleTranslate.cs | 3 +-- src/Forms/NuendoProperties.cs | 4 +++- src/Forms/SpellCheck.cs | 3 +-- src/Forms/SplitLongLines.cs | 3 +-- src/Forms/VobSubNOcrCharacterInspect.cs | 3 +-- src/Logic/BluRaySup/BluRaySupPalette.cs | 3 +-- src/Logic/ColorChooser/ColorWheel.cs | 4 +--- src/Logic/CommandLineConvert.cs | 4 +--- .../MaterialExchangeFormat/MxfParser.cs | 3 +-- src/Logic/ContainerFormats/Mp4/Boxes/Stbl.cs | 3 +-- .../ContainerFormats/RiffDecodeHeader.cs | 3 +-- src/Logic/Forms/CheckForUpdatesHelper.cs | 3 +-- src/Logic/Language.cs | 3 +-- src/Logic/LanguageStructure.cs | 4 +--- src/Logic/Settings.cs | 3 +-- src/Logic/Subtitle.cs | 3 +-- src/Logic/SubtitleFormats/AQTitle.cs | 1 - src/Logic/SubtitleFormats/AvidStl.cs | 1 - src/Logic/SubtitleFormats/CaptionsInc.cs | 1 - src/Logic/SubtitleFormats/Csv.cs | 3 +-- src/Logic/SubtitleFormats/Csv2.cs | 3 +-- src/Logic/SubtitleFormats/Csv3.cs | 3 +-- src/Logic/SubtitleFormats/Dost.cs | 3 +-- src/Logic/SubtitleFormats/Ebu.cs | 1 - src/Logic/SubtitleFormats/FinalCutProImage.cs | 3 +-- src/Logic/SubtitleFormats/FinalCutProXCM.cs | 3 +-- src/Logic/SubtitleFormats/FinalCutProXXml.cs | 3 +-- src/Logic/SubtitleFormats/FinalCutProXml13.cs | 4 +--- .../SubtitleFormats/FinalCutProXmlGap.cs | 4 +--- src/Logic/SubtitleFormats/Json.cs | 1 - src/Logic/SubtitleFormats/JsonType5.cs | 1 - src/Logic/SubtitleFormats/MPlayer2.cs | 3 +-- src/Logic/SubtitleFormats/MicroDvd.cs | 3 +-- src/Logic/SubtitleFormats/Oresme.cs | 1 - src/Logic/SubtitleFormats/QubeMasterImport.cs | 3 +-- src/Logic/SubtitleFormats/SatBoxPng.cs | 3 +-- .../ScenaristClosedCaptions.cs | 4 +--- .../SubtitleFormats/SmilTimesheetData.cs | 3 +-- .../SonyDVDArchitectExplicitDuration.cs | 3 +-- src/Logic/SubtitleFormats/SwiftText.cs | 3 +-- .../SubtitleFormats/SwiftTextLineNoAndDur.cs | 3 +-- .../SubtitleFormats/SwiftTextLineNumber.cs | 3 +-- src/Logic/SubtitleFormats/TMPlayer.cs | 3 +-- src/Logic/SubtitleFormats/TimedText10.cs | 3 +-- src/Logic/SubtitleFormats/TimelineAscii.cs | 4 ++-- .../SubtitleFormats/TimelineFootageAscii.cs | 4 ++-- src/Logic/SubtitleFormats/TmpegEncAW5.cs | 3 +-- src/Logic/SubtitleFormats/TmpegEncXml.cs | 3 +-- src/Logic/SubtitleFormats/TranscriberXml.cs | 3 +-- src/Logic/SubtitleFormats/TurboTitler.cs | 1 - src/Logic/SubtitleFormats/UTSubtitleXml.cs | 3 +-- src/Logic/SubtitleFormats/Ultech130.cs | 1 - src/Logic/SubtitleFormats/UnknownSubtitle1.cs | 3 +-- .../SubtitleFormats/UnknownSubtitle11.cs | 3 +-- .../SubtitleFormats/UnknownSubtitle18.cs | 3 +-- src/Logic/SubtitleFormats/UnknownSubtitle2.cs | 3 +-- .../SubtitleFormats/UnknownSubtitle27.cs | 3 +-- .../SubtitleFormats/UnknownSubtitle44.cs | 3 +-- .../SubtitleFormats/UnknownSubtitle50.cs | 3 +-- src/Logic/SubtitleFormats/UnknownSubtitle6.cs | 3 +-- .../SubtitleFormats/UnknownSubtitle69.cs | 1 - src/Logic/SubtitleFormats/UnknownSubtitle7.cs | 1 - .../SubtitleFormats/UnknownSubtitle70.cs | 3 +-- src/Logic/SubtitleFormats/UnknownSubtitle9.cs | 3 +-- src/Logic/SubtitleFormats/WebVTT.cs | 4 +--- .../WebVTTFileWithLineNumber.cs | 4 +--- src/Logic/SubtitleFormats/Wsb.cs | 3 +-- src/Logic/TextDraw.cs | 3 +-- src/Logic/TransportStream/AdaptationField.cs | 1 - src/Logic/VideoPlayers/MPlayer.cs | 3 +-- src/Logic/VideoPlayers/QuartsPlayer.cs | 20 ++++++++++++++----- src/Logic/VobSub/VobSubParser.cs | 4 +--- src/Logic/ZipExtractor.cs | 6 ++++-- src/Test/FixCommonErrorsTest.cs | 4 +--- src/UpdateAssemblyInfo/Program.cs | 8 ++++---- 78 files changed, 90 insertions(+), 157 deletions(-) diff --git a/src/Forms/DoNotBreakAfterListEdit.cs b/src/Forms/DoNotBreakAfterListEdit.cs index 064ba29bc..bea83dc5b 100644 --- a/src/Forms/DoNotBreakAfterListEdit.cs +++ b/src/Forms/DoNotBreakAfterListEdit.cs @@ -32,7 +32,6 @@ namespace Nikse.SubtitleEdit.Forms { try { - string s = Path.GetFileName(fileName); string languageId = s.Substring(0, s.IndexOf('_')); var ci = CultureInfo.GetCultureInfoByIetfLanguageTag(languageId); diff --git a/src/Forms/DvdSubRip.cs b/src/Forms/DvdSubRip.cs index e1e388491..e6198a994 100644 --- a/src/Forms/DvdSubRip.cs +++ b/src/Forms/DvdSubRip.cs @@ -280,7 +280,6 @@ namespace Nikse.SubtitleEdit.Forms _lastNavEndPts = vobuEPtm; } } - } position += 0x800; @@ -491,4 +490,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} +} \ No newline at end of file diff --git a/src/Forms/EffectKaraoke.cs b/src/Forms/EffectKaraoke.cs index 3f182ae86..60f2f676e 100644 --- a/src/Forms/EffectKaraoke.cs +++ b/src/Forms/EffectKaraoke.cs @@ -166,7 +166,7 @@ namespace Nikse.SubtitleEdit.Forms richTextBoxPreview.Text += text; _colorList.Add(new ColorEntry { Start = length, Length = text.Length, Color = string.IsNullOrWhiteSpace(color) ? Color.White : ColorTranslator.FromHtml(color) }); - + var fontStyle = new FontStyle(); if (underline) fontStyle = fontStyle | FontStyle.Underline; @@ -384,4 +384,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} +} \ No newline at end of file diff --git a/src/Forms/GoogleTranslate.cs b/src/Forms/GoogleTranslate.cs index 6769e5bb0..4cdfe984e 100644 --- a/src/Forms/GoogleTranslate.cs +++ b/src/Forms/GoogleTranslate.cs @@ -318,7 +318,7 @@ namespace Nikse.SubtitleEdit.Forms { string languagePair = (comboBoxFrom.SelectedItem as ComboBoxItem).Value + "|" + (comboBoxTo.SelectedItem as ComboBoxItem).Value; bool romanji = languagePair.EndsWith("|romanji", StringComparison.InvariantCulture); - if (romanji) + if (romanji) languagePair = (comboBoxFrom.SelectedItem as ComboBoxItem).Value + "|ja" ; input = PreTranslate(input.TrimEnd('|').Trim()); @@ -485,7 +485,6 @@ namespace Nikse.SubtitleEdit.Forms } } } - } string res = sb.ToString(); res = res.Replace(NewlineString, Environment.NewLine); diff --git a/src/Forms/NuendoProperties.cs b/src/Forms/NuendoProperties.cs index 1688b0aca..24257786f 100644 --- a/src/Forms/NuendoProperties.cs +++ b/src/Forms/NuendoProperties.cs @@ -77,7 +77,9 @@ namespace Nikse.SubtitleEdit.Forms } } } - catch { } + catch + { + } } lineNumber++; } diff --git a/src/Forms/SpellCheck.cs b/src/Forms/SpellCheck.cs index 03e9d145b..4354a8537 100644 --- a/src/Forms/SpellCheck.cs +++ b/src/Forms/SpellCheck.cs @@ -736,7 +736,6 @@ namespace Nikse.SubtitleEdit.Forms ShowDialog(_mainWindow); return; // wait for user input } - } } } @@ -1254,4 +1253,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} +} \ No newline at end of file diff --git a/src/Forms/SplitLongLines.cs b/src/Forms/SplitLongLines.cs index 21fc2b9c3..bd5f14bce 100644 --- a/src/Forms/SplitLongLines.cs +++ b/src/Forms/SplitLongLines.cs @@ -185,7 +185,6 @@ namespace Nikse.SubtitleEdit.Forms var arr = dialogText.SplitToLines(); if (arr.Length == 2 && (arr[0].StartsWith('-') || arr[0].StartsWith("-")) && (arr[1].StartsWith('-') || arr[1].StartsWith("-"))) isDialog = true; - } if (!isDialog && !SplitLongLinesHelper.QualifiesForSplit(Utilities.AutoBreakLine(p.Text, language), singleLineMaxCharacters, totalLineMaxCharacters)) @@ -368,4 +367,4 @@ namespace Nikse.SubtitleEdit.Forms } } -} +} \ No newline at end of file diff --git a/src/Forms/VobSubNOcrCharacterInspect.cs b/src/Forms/VobSubNOcrCharacterInspect.cs index 7004fe58c..c1ef6dd23 100644 --- a/src/Forms/VobSubNOcrCharacterInspect.cs +++ b/src/Forms/VobSubNOcrCharacterInspect.cs @@ -76,7 +76,6 @@ namespace Nikse.SubtitleEdit.Forms } index++; } - } private void listBoxInspectItems_SelectedIndexChanged(object sender, EventArgs e) @@ -297,4 +296,4 @@ namespace Nikse.SubtitleEdit.Forms form.ShowDialog(this); } } -} +} \ No newline at end of file diff --git a/src/Logic/BluRaySup/BluRaySupPalette.cs b/src/Logic/BluRaySup/BluRaySupPalette.cs index a1cc25a8b..744091a3f 100644 --- a/src/Logic/BluRaySup/BluRaySupPalette.cs +++ b/src/Logic/BluRaySup/BluRaySupPalette.cs @@ -172,7 +172,6 @@ namespace Nikse.SubtitleEdit.Logic.BluRaySup public BluRaySupPalette(int palSize) : this(palSize, false) { - } /** @@ -469,4 +468,4 @@ namespace Nikse.SubtitleEdit.Logic.BluRaySup } } -} +} \ No newline at end of file diff --git a/src/Logic/ColorChooser/ColorWheel.cs b/src/Logic/ColorChooser/ColorWheel.cs index 13e63ff88..432e9e3de 100644 --- a/src/Logic/ColorChooser/ColorWheel.cs +++ b/src/Logic/ColorChooser/ColorWheel.cs @@ -205,7 +205,6 @@ namespace Nikse.SubtitleEdit.Logic.ColorChooser { try { - // You've moved the mouse. // Now update the screen to match. @@ -341,7 +340,6 @@ namespace Nikse.SubtitleEdit.Logic.ColorChooser // Draw the gradients and points. UpdateDisplay(); - } catch (Exception e) { @@ -600,4 +598,4 @@ namespace Nikse.SubtitleEdit.Logic.ColorChooser } } -} +} \ No newline at end of file diff --git a/src/Logic/CommandLineConvert.cs b/src/Logic/CommandLineConvert.cs index 17c9fc5ab..004b72d25 100644 --- a/src/Logic/CommandLineConvert.cs +++ b/src/Logic/CommandLineConvert.cs @@ -221,7 +221,6 @@ namespace Nikse.SubtitleEdit.Logic if (toFormat.ToLower() != AdvancedSubStationAlpha.NameOfFormat.ToLower().Replace(" ", string.Empty) && toFormat.ToLower() != SubStationAlpha.NameOfFormat.ToLower().Replace(" ", string.Empty)) { - foreach (SubtitleFormat sf in formats) { if (sf.Name.Replace(" ", string.Empty).Equals(toFormat, StringComparison.OrdinalIgnoreCase) || sf.Name.Replace(" ", string.Empty).Equals(toFormat.Replace(" ", string.Empty), StringComparison.OrdinalIgnoreCase)) @@ -230,7 +229,6 @@ namespace Nikse.SubtitleEdit.Logic break; } } - } } @@ -723,4 +721,4 @@ namespace Nikse.SubtitleEdit.Logic } } -} +} \ No newline at end of file diff --git a/src/Logic/ContainerFormats/MaterialExchangeFormat/MxfParser.cs b/src/Logic/ContainerFormats/MaterialExchangeFormat/MxfParser.cs index 12e318d39..8b8fd714c 100644 --- a/src/Logic/ContainerFormats/MaterialExchangeFormat/MxfParser.cs +++ b/src/Logic/ContainerFormats/MaterialExchangeFormat/MxfParser.cs @@ -19,7 +19,6 @@ namespace Nikse.SubtitleEdit.Logic.ContainerFormats.MaterialExchangeFormat public MxfParser(string fileName) { - FileName = fileName; using (var fs = new FileStream(FileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)) { @@ -126,4 +125,4 @@ namespace Nikse.SubtitleEdit.Logic.ContainerFormats.MaterialExchangeFormat } } -} +} \ No newline at end of file diff --git a/src/Logic/ContainerFormats/Mp4/Boxes/Stbl.cs b/src/Logic/ContainerFormats/Mp4/Boxes/Stbl.cs index 7be7be1b0..324f6bb03 100644 --- a/src/Logic/ContainerFormats/Mp4/Boxes/Stbl.cs +++ b/src/Logic/ContainerFormats/Mp4/Boxes/Stbl.cs @@ -102,7 +102,6 @@ namespace Nikse.SubtitleEdit.Logic.ContainerFormats.Mp4.Boxes { for (int i = 0; i < numberOfSampleTimes; i++) { - uint sampleCount = GetUInt(8 + i * 8); uint sampleDelta = GetUInt(12 + i * 8); totalTime += sampleDelta / (double)timeScale; @@ -198,4 +197,4 @@ namespace Nikse.SubtitleEdit.Logic.ContainerFormats.Mp4.Boxes } } -} +} \ No newline at end of file diff --git a/src/Logic/ContainerFormats/RiffDecodeHeader.cs b/src/Logic/ContainerFormats/RiffDecodeHeader.cs index dfe064cd9..bc81f0bc1 100644 --- a/src/Logic/ContainerFormats/RiffDecodeHeader.cs +++ b/src/Logic/ContainerFormats/RiffDecodeHeader.cs @@ -390,7 +390,6 @@ namespace Nikse.SubtitleEdit.Logic.ContainerFormats { m_audDataRate /= (double)avi->dwSampleSize; } - } else { @@ -449,4 +448,4 @@ namespace Nikse.SubtitleEdit.Logic.ContainerFormats #endregion WAVE processing } -} +} \ No newline at end of file diff --git a/src/Logic/Forms/CheckForUpdatesHelper.cs b/src/Logic/Forms/CheckForUpdatesHelper.cs index 1b0d228ee..0353082bb 100644 --- a/src/Logic/Forms/CheckForUpdatesHelper.cs +++ b/src/Logic/Forms/CheckForUpdatesHelper.cs @@ -181,8 +181,7 @@ namespace Nikse.SubtitleEdit.Logic.Forms { return false; } - } } -} +} \ No newline at end of file diff --git a/src/Logic/Language.cs b/src/Logic/Language.cs index dfc85b80b..13fd8e45a 100644 --- a/src/Logic/Language.cs +++ b/src/Logic/Language.cs @@ -2438,7 +2438,6 @@ Keep changes?", Title = "WebVTT - set new voice", VoiceName = "Name of voice", }; - } //public static Language Load(StreamReader sr) // normal but slow .net way @@ -2496,4 +2495,4 @@ Keep changes?", } } -} +} \ No newline at end of file diff --git a/src/Logic/LanguageStructure.cs b/src/Logic/LanguageStructure.cs index 874d4577d..c23f22745 100644 --- a/src/Logic/LanguageStructure.cs +++ b/src/Logic/LanguageStructure.cs @@ -1322,7 +1322,6 @@ public string SaveSelectedLines { get; set; } public string WebVTTSetNewVoice { get; set; } public string WebVTTRemoveVoices { get; set; } - } public FileMenu File { get; set; } @@ -1410,7 +1409,6 @@ public string Fast { get; set; } public string VeryFast { get; set; } } - } public class MatroskaSubtitleChooser @@ -2322,4 +2320,4 @@ } } -} +} \ No newline at end of file diff --git a/src/Logic/Settings.cs b/src/Logic/Settings.cs index 5678984c0..a4b2217c6 100644 --- a/src/Logic/Settings.cs +++ b/src/Logic/Settings.cs @@ -727,7 +727,6 @@ namespace Nikse.SubtitleEdit.Logic GuessUnknownWords = true; AutoBreakSubtitleIfMoreThanTwoLines = true; ItalicFactor = 0.2; - } } @@ -3203,4 +3202,4 @@ namespace Nikse.SubtitleEdit.Logic } } -} +} \ No newline at end of file diff --git a/src/Logic/Subtitle.cs b/src/Logic/Subtitle.cs index 8703362bb..6c1c89758 100644 --- a/src/Logic/Subtitle.cs +++ b/src/Logic/Subtitle.cs @@ -387,7 +387,6 @@ namespace Nikse.SubtitleEdit.Logic if (p.Duration.TotalMilliseconds <= 0) p.EndTime.TotalMilliseconds = p.StartTime.TotalMilliseconds + 1; } - } } } @@ -529,4 +528,4 @@ namespace Nikse.SubtitleEdit.Logic } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/AQTitle.cs b/src/Logic/SubtitleFormats/AQTitle.cs index 2e8e61f5f..a81be1aa1 100644 --- a/src/Logic/SubtitleFormats/AQTitle.cs +++ b/src/Logic/SubtitleFormats/AQTitle.cs @@ -135,7 +135,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats } } subtitle.Renumber(); - } private static string EncodeTimeCode(TimeCode time) diff --git a/src/Logic/SubtitleFormats/AvidStl.cs b/src/Logic/SubtitleFormats/AvidStl.cs index e32d9f5bf..4910266c5 100644 --- a/src/Logic/SubtitleFormats/AvidStl.cs +++ b/src/Logic/SubtitleFormats/AvidStl.cs @@ -160,7 +160,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats { return true; } - } } catch diff --git a/src/Logic/SubtitleFormats/CaptionsInc.cs b/src/Logic/SubtitleFormats/CaptionsInc.cs index 15b872fff..d4e41f9ff 100644 --- a/src/Logic/SubtitleFormats/CaptionsInc.cs +++ b/src/Logic/SubtitleFormats/CaptionsInc.cs @@ -75,7 +75,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats text.Add(0x74); //text.Add(0x17); //text.Add(0x21); - } // codes+text length diff --git a/src/Logic/SubtitleFormats/Csv.cs b/src/Logic/SubtitleFormats/Csv.cs index be2257736..168fe066d 100644 --- a/src/Logic/SubtitleFormats/Csv.cs +++ b/src/Logic/SubtitleFormats/Csv.cs @@ -36,7 +36,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats fine++; else failed++; - } return fine > failed; } @@ -96,4 +95,4 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/Csv2.cs b/src/Logic/SubtitleFormats/Csv2.cs index fcf7bfab8..b18ff5c54 100644 --- a/src/Logic/SubtitleFormats/Csv2.cs +++ b/src/Logic/SubtitleFormats/Csv2.cs @@ -50,7 +50,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats else failed++; } - } return fine > failed; } @@ -130,4 +129,4 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/Csv3.cs b/src/Logic/SubtitleFormats/Csv3.cs index 55b358ec6..8897d16fb 100644 --- a/src/Logic/SubtitleFormats/Csv3.cs +++ b/src/Logic/SubtitleFormats/Csv3.cs @@ -54,7 +54,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats else failed++; } - } if (failed > 20) return false; @@ -193,4 +192,4 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/Dost.cs b/src/Logic/SubtitleFormats/Dost.cs index bfb42cac4..510efd710 100644 --- a/src/Logic/SubtitleFormats/Dost.cs +++ b/src/Logic/SubtitleFormats/Dost.cs @@ -73,7 +73,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats _errorCount++; System.Diagnostics.Debug.WriteLine(exception.Message); } - } } else if (line.StartsWith("$DROP=")) @@ -113,4 +112,4 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/Ebu.cs b/src/Logic/SubtitleFormats/Ebu.cs index d95e6aff1..0f103cfda 100644 --- a/src/Logic/SubtitleFormats/Ebu.cs +++ b/src/Logic/SubtitleFormats/Ebu.cs @@ -155,7 +155,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats return result; return "Length must be 1024 but is " + result.Length; } - } /// diff --git a/src/Logic/SubtitleFormats/FinalCutProImage.cs b/src/Logic/SubtitleFormats/FinalCutProImage.cs index a5aa719e6..bc1a687e2 100644 --- a/src/Logic/SubtitleFormats/FinalCutProImage.cs +++ b/src/Logic/SubtitleFormats/FinalCutProImage.cs @@ -98,8 +98,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats _errorCount = 1; return; } - } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/FinalCutProXCM.cs b/src/Logic/SubtitleFormats/FinalCutProXCM.cs index 55fd4199e..c2ca6eb8c 100644 --- a/src/Logic/SubtitleFormats/FinalCutProXCM.cs +++ b/src/Logic/SubtitleFormats/FinalCutProXCM.cs @@ -140,7 +140,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats // 220220/60000s if (duration != null) { - var arr = duration.Value.TrimEnd('s').Split('/'); if (arr.Length == 2) { @@ -155,4 +154,4 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/FinalCutProXXml.cs b/src/Logic/SubtitleFormats/FinalCutProXXml.cs index 5f08e4fbd..d6e85634e 100644 --- a/src/Logic/SubtitleFormats/FinalCutProXXml.cs +++ b/src/Logic/SubtitleFormats/FinalCutProXXml.cs @@ -168,7 +168,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats _errorCount = 1; return; } - } private static TimeCode DecodeTime(XmlAttribute duration) @@ -190,4 +189,4 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/FinalCutProXml13.cs b/src/Logic/SubtitleFormats/FinalCutProXml13.cs index d7923c6e4..604b3facf 100644 --- a/src/Logic/SubtitleFormats/FinalCutProXml13.cs +++ b/src/Logic/SubtitleFormats/FinalCutProXml13.cs @@ -187,7 +187,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats _errorCount = 1; return; } - } private static TimeCode DecodeTime(XmlAttribute duration) @@ -195,7 +194,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats // 220220/60000s if (duration != null) { - var arr = duration.Value.TrimEnd('s').Split('/'); if (arr.Length == 2) { @@ -210,4 +208,4 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/FinalCutProXmlGap.cs b/src/Logic/SubtitleFormats/FinalCutProXmlGap.cs index 85fc74b94..5e418ac80 100644 --- a/src/Logic/SubtitleFormats/FinalCutProXmlGap.cs +++ b/src/Logic/SubtitleFormats/FinalCutProXmlGap.cs @@ -140,7 +140,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats _errorCount = 1; return; } - } private static TimeCode DecodeTime(XmlAttribute duration) @@ -148,7 +147,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats // 220220/60000s if (duration != null) { - var arr = duration.Value.TrimEnd('s').Split('/'); if (arr.Length == 2) { @@ -163,4 +161,4 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/Json.cs b/src/Logic/SubtitleFormats/Json.cs index 308556462..ac2c0759d 100644 --- a/src/Logic/SubtitleFormats/Json.cs +++ b/src/Logic/SubtitleFormats/Json.cs @@ -246,7 +246,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats } } } - } return list; } diff --git a/src/Logic/SubtitleFormats/JsonType5.cs b/src/Logic/SubtitleFormats/JsonType5.cs index 1813864c1..ab5f85feb 100644 --- a/src/Logic/SubtitleFormats/JsonType5.cs +++ b/src/Logic/SubtitleFormats/JsonType5.cs @@ -122,7 +122,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats { try { - string text = texts[i]; if (text.StartsWith('[')) { diff --git a/src/Logic/SubtitleFormats/MPlayer2.cs b/src/Logic/SubtitleFormats/MPlayer2.cs index 94a5e223a..c971c6cfe 100644 --- a/src/Logic/SubtitleFormats/MPlayer2.cs +++ b/src/Logic/SubtitleFormats/MPlayer2.cs @@ -105,7 +105,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats count++; } sb.AppendLine(); - } return sb.ToString().Trim(); } @@ -160,4 +159,4 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats subtitle.Renumber(); } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/MicroDvd.cs b/src/Logic/SubtitleFormats/MicroDvd.cs index 8ad79e142..88c1bf858 100644 --- a/src/Logic/SubtitleFormats/MicroDvd.cs +++ b/src/Logic/SubtitleFormats/MicroDvd.cs @@ -311,7 +311,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats foreach (string s2 in parts) { - if (count > 0) lineSb.AppendLine(); @@ -565,4 +564,4 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats return i; } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/Oresme.cs b/src/Logic/SubtitleFormats/Oresme.cs index 719f37e79..8444d0e83 100644 --- a/src/Logic/SubtitleFormats/Oresme.cs +++ b/src/Logic/SubtitleFormats/Oresme.cs @@ -99,7 +99,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats if (subtitle.Paragraphs.Count > 0) subtitle.Paragraphs[subtitle.Paragraphs.Count - 1].EndTime.TotalMilliseconds = subtitle.Paragraphs[subtitle.Paragraphs.Count - 1].StartTime.TotalMilliseconds + Utilities.GetOptimalDisplayMilliseconds(subtitle.Paragraphs[subtitle.Paragraphs.Count - 1].Text); - } subtitle.RemoveEmptyLines(); subtitle.Renumber(); diff --git a/src/Logic/SubtitleFormats/QubeMasterImport.cs b/src/Logic/SubtitleFormats/QubeMasterImport.cs index 4a0ae0b5b..5e57760d7 100644 --- a/src/Logic/SubtitleFormats/QubeMasterImport.cs +++ b/src/Logic/SubtitleFormats/QubeMasterImport.cs @@ -56,7 +56,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats sb.AppendLine(HtmlUtil.RemoveHtmlTags(p.Text)); sb.AppendLine(EncodeTimeCode(p.StartTime)); sb.AppendLine(EncodeTimeCode(p.EndTime)); - } return sb.ToString(); } @@ -149,4 +148,4 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/SatBoxPng.cs b/src/Logic/SubtitleFormats/SatBoxPng.cs index 8bd14fc1c..310d52aea 100644 --- a/src/Logic/SubtitleFormats/SatBoxPng.cs +++ b/src/Logic/SubtitleFormats/SatBoxPng.cs @@ -87,7 +87,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats string value = line.Substring(start + 3, end - start - 3); return value; } - } return string.Empty; } @@ -98,4 +97,4 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/ScenaristClosedCaptions.cs b/src/Logic/SubtitleFormats/ScenaristClosedCaptions.cs index 4c1fbe902..44f5dccac 100644 --- a/src/Logic/SubtitleFormats/ScenaristClosedCaptions.cs +++ b/src/Logic/SubtitleFormats/ScenaristClosedCaptions.cs @@ -875,7 +875,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats { switch (code.ToLower(CultureInfo.InvariantCulture)) { - //NO x-coordinate? case "1140": return new SccPositionAndStyle(Color.White, FontStyle.Regular, 1, 0); case "1160": return new SccPositionAndStyle(Color.White, FontStyle.Regular, 2, 0); @@ -1664,7 +1663,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats { if (part != "94ae" && part != "9420" && part != "94ad" && part != "9426") { - // Spanish inverted question mark (extended char) if (part == "91b3" && k < parts.Length - 1 && parts[k + 1] == "91b3") { @@ -1791,4 +1789,4 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/SmilTimesheetData.cs b/src/Logic/SubtitleFormats/SmilTimesheetData.cs index 64768baa4..b799cfbf8 100644 --- a/src/Logic/SubtitleFormats/SmilTimesheetData.cs +++ b/src/Logic/SubtitleFormats/SmilTimesheetData.cs @@ -173,7 +173,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats } } } - } if (syncEndPos <= 0) { @@ -212,4 +211,4 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/SonyDVDArchitectExplicitDuration.cs b/src/Logic/SubtitleFormats/SonyDVDArchitectExplicitDuration.cs index d6c97f944..0af62af2b 100644 --- a/src/Logic/SubtitleFormats/SonyDVDArchitectExplicitDuration.cs +++ b/src/Logic/SubtitleFormats/SonyDVDArchitectExplicitDuration.cs @@ -101,7 +101,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats success = true; } } - } if (!isTimeCode && lastParagraph != null && Utilities.GetNumberOfLines(lastParagraph.Text) < 5) { @@ -114,4 +113,4 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats subtitle.Renumber(); } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/SwiftText.cs b/src/Logic/SubtitleFormats/SwiftText.cs index 0114e6e84..97bbf29d3 100644 --- a/src/Logic/SubtitleFormats/SwiftText.cs +++ b/src/Logic/SubtitleFormats/SwiftText.cs @@ -127,7 +127,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats line = line.Trim(); if (RegexTimeCodes.IsMatch(line)) { - //TIMEIN: 01:00:04:12 DURATION: 04:25 TIMEOUT: 01:00:09:07 string s = line.Replace("TIMEIN:", string.Empty).Replace("DURATION", string.Empty).Replace("TIMEOUT", string.Empty).Replace(" ", string.Empty).Replace("\t", string.Empty); string[] parts = s.Split(':'); @@ -174,4 +173,4 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats return false; } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/SwiftTextLineNoAndDur.cs b/src/Logic/SubtitleFormats/SwiftTextLineNoAndDur.cs index b80eb49ae..66756145d 100644 --- a/src/Logic/SubtitleFormats/SwiftTextLineNoAndDur.cs +++ b/src/Logic/SubtitleFormats/SwiftTextLineNoAndDur.cs @@ -134,7 +134,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats line = line.Trim(); if (RegexTimeCodes.IsMatch(line)) { - //SUBTITLE: 1 TIMEIN: 00:00:07:01 DURATION: 03:11 TIMEOUT: 00:00:10:12 string s = line.Replace("SUBTITLE:", string.Empty).Replace("TIMEIN", string.Empty).Replace("DURATION", string.Empty).Replace("TIMEOUT", string.Empty).Replace(" ", string.Empty).Replace("\t", string.Empty); string[] parts = s.Split(':'); @@ -171,4 +170,4 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/SwiftTextLineNumber.cs b/src/Logic/SubtitleFormats/SwiftTextLineNumber.cs index 3d72ce5d2..e057f0c9d 100644 --- a/src/Logic/SubtitleFormats/SwiftTextLineNumber.cs +++ b/src/Logic/SubtitleFormats/SwiftTextLineNumber.cs @@ -133,7 +133,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats line = line.Trim(); if (RegexTimeCodes.IsMatch(line)) { - //SUBTITLE: 59 TIMEIN: 00:04:28:06 TIMEOUT: 00:04:32:12 string s = line.Replace("SUBTITLE:", string.Empty).Replace("TIMEIN", string.Empty).Replace("TIMEOUT", string.Empty).Replace(" ", string.Empty).Replace("\t", string.Empty); string[] parts = s.Split(':'); @@ -169,4 +168,4 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats return false; } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/TMPlayer.cs b/src/Logic/SubtitleFormats/TMPlayer.cs index a069c1a31..597ac2e8f 100644 --- a/src/Logic/SubtitleFormats/TMPlayer.cs +++ b/src/Logic/SubtitleFormats/TMPlayer.cs @@ -126,7 +126,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats index++; p.Number = index; } - } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/TimedText10.cs b/src/Logic/SubtitleFormats/TimedText10.cs index 9cee0332a..0f9d557b4 100644 --- a/src/Logic/SubtitleFormats/TimedText10.cs +++ b/src/Logic/SubtitleFormats/TimedText10.cs @@ -680,7 +680,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats bold = true; } } - } if (innerNode.HasChildNodes) { @@ -887,4 +886,4 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/TimelineAscii.cs b/src/Logic/SubtitleFormats/TimelineAscii.cs index a5b41059f..df44f57b0 100644 --- a/src/Logic/SubtitleFormats/TimelineAscii.cs +++ b/src/Logic/SubtitleFormats/TimelineAscii.cs @@ -9,14 +9,14 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats { /// /// Timeline Ascii export - THE MOVIE TITRE EDITOR - http://www.pld.ttu.ee/~priidu/timeline/ by priidu@pld.ttu.ee - /// + /// /// Sample: /// 1. /// 00:00:43.02 /// 00:00:47.03 /// ±NE/SEVÎ /// ³ÂÍÅ/ÑÅÁß - /// + /// /// 2. /// 00:01:36.00 /// 00:01:37.00 diff --git a/src/Logic/SubtitleFormats/TimelineFootageAscii.cs b/src/Logic/SubtitleFormats/TimelineFootageAscii.cs index bcc8e6e4a..e6667e380 100644 --- a/src/Logic/SubtitleFormats/TimelineFootageAscii.cs +++ b/src/Logic/SubtitleFormats/TimelineFootageAscii.cs @@ -9,14 +9,14 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats { /// /// Timeline Ascii export - THE MOVIE TITRE EDITOR - http://www.pld.ttu.ee/~priidu/timeline/ by priidu@pld.ttu.ee - /// + /// /// Sample: /// 1. /// 41,10 /// 46,10 /// ±NE/SEVÎ /// ³ÂÍÅ/ÑÅÁß - /// + /// /// 2. /// 49,05 /// 51,09 diff --git a/src/Logic/SubtitleFormats/TmpegEncAW5.cs b/src/Logic/SubtitleFormats/TmpegEncAW5.cs index e5e7a2f60..f1ee27bf0 100644 --- a/src/Logic/SubtitleFormats/TmpegEncAW5.cs +++ b/src/Logic/SubtitleFormats/TmpegEncAW5.cs @@ -67,7 +67,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats string xmlAsString = sb.ToString().Trim(); if ((xmlAsString.Contains("") || xmlAsString.Contains(" _errorCount; @@ -82,4 +81,4 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/TmpegEncXml.cs b/src/Logic/SubtitleFormats/TmpegEncXml.cs index 088f6429f..bdf06c84e 100644 --- a/src/Logic/SubtitleFormats/TmpegEncXml.cs +++ b/src/Logic/SubtitleFormats/TmpegEncXml.cs @@ -40,7 +40,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats string xmlAsString = sb.ToString().Trim(); if ((xmlAsString.Contains("") || xmlAsString.Contains(" _errorCount; @@ -384,4 +383,4 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats return new TimeCode(int.Parse(parts[0]), int.Parse(parts[1]), int.Parse(parts[2]), int.Parse(parts[3])); } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/TranscriberXml.cs b/src/Logic/SubtitleFormats/TranscriberXml.cs index 4f8801aad..7a7408acf 100644 --- a/src/Logic/SubtitleFormats/TranscriberXml.cs +++ b/src/Logic/SubtitleFormats/TranscriberXml.cs @@ -134,8 +134,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats _errorCount = 1; return; } - } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/TurboTitler.cs b/src/Logic/SubtitleFormats/TurboTitler.cs index 569615a9a..40fccfa25 100644 --- a/src/Logic/SubtitleFormats/TurboTitler.cs +++ b/src/Logic/SubtitleFormats/TurboTitler.cs @@ -86,7 +86,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats } } subtitle.Renumber(); - } private static string EncodeTimeCode(TimeCode time) diff --git a/src/Logic/SubtitleFormats/UTSubtitleXml.cs b/src/Logic/SubtitleFormats/UTSubtitleXml.cs index 9e7cfe397..2ab1d15fe 100644 --- a/src/Logic/SubtitleFormats/UTSubtitleXml.cs +++ b/src/Logic/SubtitleFormats/UTSubtitleXml.cs @@ -108,8 +108,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats _errorCount = 1; return; } - } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/Ultech130.cs b/src/Logic/SubtitleFormats/Ultech130.cs index 4b08eb439..5631c6af7 100644 --- a/src/Logic/SubtitleFormats/Ultech130.cs +++ b/src/Logic/SubtitleFormats/Ultech130.cs @@ -404,7 +404,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats //// else if (code.Substring(11, 4) == "0101") //// sb.Append(""); //} - } else if (b == 0x80) { diff --git a/src/Logic/SubtitleFormats/UnknownSubtitle1.cs b/src/Logic/SubtitleFormats/UnknownSubtitle1.cs index 9a3dc85af..09f08558d 100644 --- a/src/Logic/SubtitleFormats/UnknownSubtitle1.cs +++ b/src/Logic/SubtitleFormats/UnknownSubtitle1.cs @@ -89,7 +89,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats p = null; _errorCount++; } - } else if (p == null) { @@ -115,4 +114,4 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats return new TimeCode(0, int.Parse(parts[0]), int.Parse(parts[1]), 0); } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/UnknownSubtitle11.cs b/src/Logic/SubtitleFormats/UnknownSubtitle11.cs index 065939c01..8ecb3ad84 100644 --- a/src/Logic/SubtitleFormats/UnknownSubtitle11.cs +++ b/src/Logic/SubtitleFormats/UnknownSubtitle11.cs @@ -225,7 +225,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats } text = lineSb + post; subtitle.Paragraphs.Add(new Paragraph(startTime, endTime, text)); - } } catch @@ -271,4 +270,4 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats return i; } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/UnknownSubtitle18.cs b/src/Logic/SubtitleFormats/UnknownSubtitle18.cs index a82b66305..12cbb20b5 100644 --- a/src/Logic/SubtitleFormats/UnknownSubtitle18.cs +++ b/src/Logic/SubtitleFormats/UnknownSubtitle18.cs @@ -137,7 +137,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats line = line.Trim(); if (RegexTimeCodes.IsMatch(line)) { - //0001 01:00:15:08 01:00:18:05 try { @@ -168,4 +167,4 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats return false; } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/UnknownSubtitle2.cs b/src/Logic/SubtitleFormats/UnknownSubtitle2.cs index c6666bbec..772bcff5a 100644 --- a/src/Logic/SubtitleFormats/UnknownSubtitle2.cs +++ b/src/Logic/SubtitleFormats/UnknownSubtitle2.cs @@ -118,7 +118,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats subtitle.Paragraphs.Add(_paragraph); _paragraph = new Paragraph(); _expecting = ExpectingLine.Number; - } break; } @@ -151,4 +150,4 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/UnknownSubtitle27.cs b/src/Logic/SubtitleFormats/UnknownSubtitle27.cs index ae2830882..b8df27a0d 100644 --- a/src/Logic/SubtitleFormats/UnknownSubtitle27.cs +++ b/src/Logic/SubtitleFormats/UnknownSubtitle27.cs @@ -91,7 +91,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats System.Diagnostics.Debug.WriteLine(exception.Message); } } - } else if (string.IsNullOrWhiteSpace(line)) { @@ -131,4 +130,4 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/UnknownSubtitle44.cs b/src/Logic/SubtitleFormats/UnknownSubtitle44.cs index 2e98b272e..e0e3a8d16 100644 --- a/src/Logic/SubtitleFormats/UnknownSubtitle44.cs +++ b/src/Logic/SubtitleFormats/UnknownSubtitle44.cs @@ -110,7 +110,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats System.Diagnostics.Debug.WriteLine(exception.Message); } } - } else if (string.IsNullOrWhiteSpace(line) || regexTimeCodes1.IsMatch(" " + s)) { @@ -151,4 +150,4 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/UnknownSubtitle50.cs b/src/Logic/SubtitleFormats/UnknownSubtitle50.cs index 730163e76..5b701424a 100644 --- a/src/Logic/SubtitleFormats/UnknownSubtitle50.cs +++ b/src/Logic/SubtitleFormats/UnknownSubtitle50.cs @@ -146,7 +146,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats expecting = ExpectingLine.TimeCodes; } } - } if (!string.IsNullOrWhiteSpace(p.Text)) subtitle.Paragraphs.Add(p); @@ -177,4 +176,4 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats } } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/UnknownSubtitle6.cs b/src/Logic/SubtitleFormats/UnknownSubtitle6.cs index 2caf85cbd..d06fde673 100644 --- a/src/Logic/SubtitleFormats/UnknownSubtitle6.cs +++ b/src/Logic/SubtitleFormats/UnknownSubtitle6.cs @@ -122,7 +122,6 @@ SRPSKI paragraph.Text += Environment.NewLine + s; else paragraph.Text = s; - } } } @@ -132,4 +131,4 @@ SRPSKI subtitle.Renumber(); } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/UnknownSubtitle69.cs b/src/Logic/SubtitleFormats/UnknownSubtitle69.cs index 3016d5ea0..18546e275 100644 --- a/src/Logic/SubtitleFormats/UnknownSubtitle69.cs +++ b/src/Logic/SubtitleFormats/UnknownSubtitle69.cs @@ -34,7 +34,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats public override string ToText(Subtitle subtitle, string title) { - //1) 00:00:06:14 00:00:07:07 Durée : 00:18 Lisibilité : 011 Intervalle : 06:14 Nbc : 018 //text //line2 diff --git a/src/Logic/SubtitleFormats/UnknownSubtitle7.cs b/src/Logic/SubtitleFormats/UnknownSubtitle7.cs index 5ffd2857d..63762fd3b 100644 --- a/src/Logic/SubtitleFormats/UnknownSubtitle7.cs +++ b/src/Logic/SubtitleFormats/UnknownSubtitle7.cs @@ -135,7 +135,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats } } subtitle.Renumber(); - } private static string EncodeTimeCode(TimeCode time) diff --git a/src/Logic/SubtitleFormats/UnknownSubtitle70.cs b/src/Logic/SubtitleFormats/UnknownSubtitle70.cs index e7554531c..53dfa7ac7 100644 --- a/src/Logic/SubtitleFormats/UnknownSubtitle70.cs +++ b/src/Logic/SubtitleFormats/UnknownSubtitle70.cs @@ -310,7 +310,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats foreach (string s2 in parts) { - if (count > 0) lineSb.AppendLine(); @@ -564,4 +563,4 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats return i; } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/UnknownSubtitle9.cs b/src/Logic/SubtitleFormats/UnknownSubtitle9.cs index 171271bd3..2945b3a8c 100644 --- a/src/Logic/SubtitleFormats/UnknownSubtitle9.cs +++ b/src/Logic/SubtitleFormats/UnknownSubtitle9.cs @@ -102,11 +102,10 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats int durationMilliseconds; if (text.Length > 0 && int.TryParse(startTime, out startMilliseconds) && int.TryParse(duration, out durationMilliseconds)) subtitle.Paragraphs.Add(new Paragraph(text, startMilliseconds, startMilliseconds + durationMilliseconds)); - } } subtitle.Renumber(); } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/WebVTT.cs b/src/Logic/SubtitleFormats/WebVTT.cs index b3a3b3482..095896deb 100644 --- a/src/Logic/SubtitleFormats/WebVTT.cs +++ b/src/Logic/SubtitleFormats/WebVTT.cs @@ -169,7 +169,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats startIndex = s.IndexOf("", string.Empty); } - } return text; } @@ -201,4 +199,4 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/WebVTTFileWithLineNumber.cs b/src/Logic/SubtitleFormats/WebVTTFileWithLineNumber.cs index 8ee3731d1..6f4f104cb 100644 --- a/src/Logic/SubtitleFormats/WebVTTFileWithLineNumber.cs +++ b/src/Logic/SubtitleFormats/WebVTTFileWithLineNumber.cs @@ -185,7 +185,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats startIndex = s.IndexOf("", string.Empty); } - } return text; } @@ -217,4 +215,4 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats } } -} +} \ No newline at end of file diff --git a/src/Logic/SubtitleFormats/Wsb.cs b/src/Logic/SubtitleFormats/Wsb.cs index 0ecba18f9..9c602254b 100644 --- a/src/Logic/SubtitleFormats/Wsb.cs +++ b/src/Logic/SubtitleFormats/Wsb.cs @@ -76,7 +76,6 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats { try { - string text = line.Substring(0, indexOfTen).Trim(); string time = line.Substring(indexOf7001 - 16, 16); p = new Paragraph(DecodeTimeCode(time.Substring(0, 8)), DecodeTimeCode(time.Substring(8)), text); @@ -112,4 +111,4 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats } } -} +} \ No newline at end of file diff --git a/src/Logic/TextDraw.cs b/src/Logic/TextDraw.cs index a69b3358f..268393ec8 100644 --- a/src/Logic/TextDraw.cs +++ b/src/Logic/TextDraw.cs @@ -107,7 +107,6 @@ namespace Nikse.SubtitleEdit.Logic { using (var path = new GraphicsPath()) { - var sb = new StringBuilder(text); bool newLine = false; const int leftMargin = 0; @@ -137,4 +136,4 @@ namespace Nikse.SubtitleEdit.Logic } } -} +} \ No newline at end of file diff --git a/src/Logic/TransportStream/AdaptationField.cs b/src/Logic/TransportStream/AdaptationField.cs index dccd17f13..60323f3fe 100644 --- a/src/Logic/TransportStream/AdaptationField.cs +++ b/src/Logic/TransportStream/AdaptationField.cs @@ -103,7 +103,6 @@ namespace Nikse.SubtitleEdit.Logic.TransportStream { AdaptationFieldExtensionLength = packetBuffer[index]; } - } } } \ No newline at end of file diff --git a/src/Logic/VideoPlayers/MPlayer.cs b/src/Logic/VideoPlayers/MPlayer.cs index 2e1cfe157..c652b1c70 100644 --- a/src/Logic/VideoPlayers/MPlayer.cs +++ b/src/Logic/VideoPlayers/MPlayer.cs @@ -236,7 +236,6 @@ namespace Nikse.SubtitleEdit.Logic.VideoPlayers _mplayer.StandardInput.WriteLine("loadfile " + _videoFileName); if (OnVideoEnded != null) OnVideoEnded.Invoke(this, null); - } return; } @@ -414,4 +413,4 @@ namespace Nikse.SubtitleEdit.Logic.VideoPlayers } } -} +} \ No newline at end of file diff --git a/src/Logic/VideoPlayers/QuartsPlayer.cs b/src/Logic/VideoPlayers/QuartsPlayer.cs index 53c298b97..145b7ed1b 100644 --- a/src/Logic/VideoPlayers/QuartsPlayer.cs +++ b/src/Logic/VideoPlayers/QuartsPlayer.cs @@ -52,7 +52,9 @@ namespace Nikse.SubtitleEdit.Logic.VideoPlayers else (_quartzFilgraphManager as IBasicAudio).Volume = (value - 100) * 35; } - catch { } + catch + { + } } } @@ -207,7 +209,9 @@ namespace Nikse.SubtitleEdit.Logic.VideoPlayers Marshal.ReleaseComObject(quartzFilgraphManager); } - catch { } + catch + { + } return info; } @@ -230,7 +234,9 @@ namespace Nikse.SubtitleEdit.Logic.VideoPlayers { OnVideoLoaded.Invoke(_quartzFilgraphManager, new EventArgs()); } - catch { } + catch + { + } } _videoEndTimer = null; } @@ -286,7 +292,9 @@ namespace Nikse.SubtitleEdit.Logic.VideoPlayers if (_quartzVideo != null) _quartzVideo.Owner = -1; } - catch { } + catch + { + } if (_quartzFilgraphManager != null) { @@ -296,7 +304,9 @@ namespace Nikse.SubtitleEdit.Logic.VideoPlayers Marshal.ReleaseComObject(_quartzFilgraphManager); _quartzFilgraphManager = null; } - catch { } + catch + { + } } _quartzVideo = null; } diff --git a/src/Logic/VobSub/VobSubParser.cs b/src/Logic/VobSub/VobSubParser.cs index 4c25f9799..b28bc5fbb 100644 --- a/src/Logic/VobSub/VobSubParser.cs +++ b/src/Logic/VobSub/VobSubParser.cs @@ -105,7 +105,6 @@ namespace Nikse.SubtitleEdit.Logic.VobSub fs.Seek(position, SeekOrigin.Begin); } } - } } } @@ -212,7 +211,6 @@ namespace Nikse.SubtitleEdit.Logic.VobSub buffer[1] == 0 && buffer[2] == 1 && buffer[3] == 0xba; // 0xba == 186 - MPEG-2 Pack Header - } internal static bool IsPrivateStream1(byte[] buffer, int index) @@ -237,4 +235,4 @@ namespace Nikse.SubtitleEdit.Logic.VobSub } } -} +} \ No newline at end of file diff --git a/src/Logic/ZipExtractor.cs b/src/Logic/ZipExtractor.cs index bd651f4ca..d21c28608 100644 --- a/src/Logic/ZipExtractor.cs +++ b/src/Logic/ZipExtractor.cs @@ -407,7 +407,9 @@ namespace System.IO.Compression } } while (this.ZipFileStream.Position > 0); } - catch { } + catch + { + } return false; } @@ -432,4 +434,4 @@ namespace System.IO.Compression #endregion IDisposable Members } -} +} \ No newline at end of file diff --git a/src/Test/FixCommonErrorsTest.cs b/src/Test/FixCommonErrorsTest.cs index d5fe66fa8..92c5084fb 100644 --- a/src/Test/FixCommonErrorsTest.cs +++ b/src/Test/FixCommonErrorsTest.cs @@ -96,7 +96,6 @@ namespace Test CopyStream(strm, file); } } - } //Use ClassCleanup to run code after all tests in a class have run @@ -572,7 +571,6 @@ namespace Test { using (var form = new FixCommonErrors()) { - Configuration.Settings.Tools.OcrFixUseHardcodedRules = true; const string input = "i.e., your killer."; var ofe = new Nikse.SubtitleEdit.Logic.Ocr.OcrFixEngine("eng", "not there", form); @@ -1454,4 +1452,4 @@ namespace Test #endregion } -} +} \ No newline at end of file diff --git a/src/UpdateAssemblyInfo/Program.cs b/src/UpdateAssemblyInfo/Program.cs index 15f5537c0..fe6b00f94 100644 --- a/src/UpdateAssemblyInfo/Program.cs +++ b/src/UpdateAssemblyInfo/Program.cs @@ -9,7 +9,6 @@ namespace UpdateAssemblyInfo private class Template { - private string templateFile; private string templateText; @@ -31,7 +30,6 @@ namespace UpdateAssemblyInfo { File.WriteAllText(target, templateText, Encoding.UTF8); } - } private static int Main(string[] args) @@ -165,11 +163,13 @@ namespace UpdateAssemblyInfo return path; } } - catch { } + catch + { + } Console.WriteLine("WARNING: Might not be able to run Git command line tool!"); return "git"; } } -} +} \ No newline at end of file