diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-08-24 23:54:53 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-08-24 23:54:53 -0400 |
| commit | 73082a0449bcab1a9ed2932a8fe8af81dd88febc (patch) | |
| tree | 68913d2a12b27ec80b0b8b8f4587b020d6b3ab1b | |
| parent | 84062573496db136fb011c598fee7b3de129e070 (diff) | |
| parent | 6faca263a84996bd9964eafaa636c95b4cb57f64 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
5 files changed, 5 insertions, 5 deletions
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs b/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs index f94fae9e9..84cd1eb2d 100644 --- a/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs +++ b/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs @@ -48,7 +48,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles } multiline.Add(line); } - subEvent.Text = string.Join(@"\N", multiline); + subEvent.Text = string.Join(@"\n", multiline); subEvent.Text = Regex.Replace(subEvent.Text, @"\{(\\[\w]+\(?([\w\d]+,?)+\)?)+\}", string.Empty, RegexOptions.IgnoreCase); subEvent.Text = Regex.Replace(subEvent.Text, "<", "<", RegexOptions.IgnoreCase); subEvent.Text = Regex.Replace(subEvent.Text, ">", ">", RegexOptions.IgnoreCase); diff --git a/MediaBrowser.MediaEncoding/Subtitles/SrtWriter.cs b/MediaBrowser.MediaEncoding/Subtitles/SrtWriter.cs index d0d0819dd..3e574f931 100644 --- a/MediaBrowser.MediaEncoding/Subtitles/SrtWriter.cs +++ b/MediaBrowser.MediaEncoding/Subtitles/SrtWriter.cs @@ -25,7 +25,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles var text = trackEvent.Text; // TODO: Not sure how to handle these - text = Regex.Replace(text, @"\\N", " ", RegexOptions.IgnoreCase); + text = Regex.Replace(text, @"\\n", " ", RegexOptions.IgnoreCase); writer.WriteLine(text); writer.WriteLine(string.Empty); diff --git a/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs b/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs index 4b11d55ce..559a05bc8 100644 --- a/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs +++ b/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs @@ -147,7 +147,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles public static string GetFormattedText(string text) { - text = text.Replace("\\N", Environment.NewLine).Replace("\\n", Environment.NewLine); + text = text.Replace("\\n", Environment.NewLine).Replace("\\n", Environment.NewLine); bool italic = false; for (int i = 0; i < 10; i++) // just look ten times... diff --git a/MediaBrowser.MediaEncoding/Subtitles/TtmlWriter.cs b/MediaBrowser.MediaEncoding/Subtitles/TtmlWriter.cs index a937175f0..955b36ecd 100644 --- a/MediaBrowser.MediaEncoding/Subtitles/TtmlWriter.cs +++ b/MediaBrowser.MediaEncoding/Subtitles/TtmlWriter.cs @@ -34,7 +34,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles { var text = trackEvent.Text; - text = Regex.Replace(text, @"\\N", "<br/>", RegexOptions.IgnoreCase); + text = Regex.Replace(text, @"\\n", "<br/>", RegexOptions.IgnoreCase); writer.WriteLine("<p begin=\"{0}\" dur=\"{1}\">{2}</p>", trackEvent.StartPositionTicks, diff --git a/MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs b/MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs index 09f45aa61..228f0beb1 100644 --- a/MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs +++ b/MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs @@ -23,7 +23,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles var text = trackEvent.Text; // TODO: Not sure how to handle these - text = Regex.Replace(text, @"\\N", " ", RegexOptions.IgnoreCase); + text = Regex.Replace(text, @"\\n", " ", RegexOptions.IgnoreCase); writer.WriteLine(text); writer.WriteLine(string.Empty); |