aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.MediaEncoding
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-03-26 00:44:24 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-03-26 00:44:24 -0400
commit70fb64cc05c4fe51e661608c654a4cd1949cba35 (patch)
treee35def65b7c0860cad14a7a2014e1487e7c41cdd /MediaBrowser.MediaEncoding
parent9f191a3598f8d1cc6764169943186987be33a707 (diff)
subtitle parsing fixes
Diffstat (limited to 'MediaBrowser.MediaEncoding')
-rw-r--r--MediaBrowser.MediaEncoding/Subtitles/AssParser.cs7
-rw-r--r--MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs3
2 files changed, 5 insertions, 5 deletions
diff --git a/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs b/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs
index 4d426683f..e711c02b6 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs
@@ -43,10 +43,11 @@ namespace MediaBrowser.MediaEncoding.Subtitles
subEvent.StartPositionTicks = GetTicks(sections[headers["Start"]]);
subEvent.EndPositionTicks = GetTicks(sections[headers["End"]]);
- //RemoteNativeFormatting(subEvent);
-
subEvent.Text = string.Join(",", sections.Skip(headers["Text"]));
- subEvent.Text = subEvent.Text.Replace(@"\N", ParserValues.NewLine, StringComparison.OrdinalIgnoreCase);
+ RemoteNativeFormatting(subEvent);
+
+ subEvent.Text = subEvent.Text.Replace("\\n", ParserValues.NewLine, StringComparison.OrdinalIgnoreCase);
+
subEvent.Text = Regex.Replace(subEvent.Text, @"\{(\\[\w]+\(?([\w\d]+,?)+\)?)+\}", string.Empty, RegexOptions.IgnoreCase);
trackInfo.TrackEvents.Add(subEvent);
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs b/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs
index 358251625..bfc6c60fc 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs
@@ -148,8 +148,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
public static string GetFormattedText(string text)
{
- text = text.Replace("\\n", ParserValues.NewLine, StringComparison.OrdinalIgnoreCase)
- .Replace("\\n", ParserValues.NewLine, StringComparison.OrdinalIgnoreCase);
+ text = text.Replace("\\n", ParserValues.NewLine, StringComparison.OrdinalIgnoreCase);
bool italic = false;