mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-28 06:52:35 +01:00
Fixed reading of time code variation in Timed Text - thx Eric :)
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1424 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
parent
d61cc24324
commit
06002e92ba
@ -326,9 +326,10 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
|
||||
lines.ForEach(line => sb.AppendLine(line));
|
||||
var xml = new XmlDocument();
|
||||
xml.LoadXml(sb.ToString());
|
||||
|
||||
|
||||
string ns = "http://www.w3.org/ns/ttml";
|
||||
var nsmgr = new XmlNamespaceManager(xml.NameTable);
|
||||
nsmgr.AddNamespace("ttml", "http://www.w3.org/ns/ttml");
|
||||
nsmgr.AddNamespace("ttml", ns);
|
||||
XmlNode body = xml.DocumentElement.SelectSingleNode("ttml:body", nsmgr);
|
||||
subtitle.Header = sb.ToString();
|
||||
string defaultStyle = null;
|
||||
@ -361,18 +362,30 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
|
||||
{
|
||||
start = node.Attributes["begin"].InnerText;
|
||||
}
|
||||
else if (node.Attributes["begin", ns] != null)
|
||||
{
|
||||
start = node.Attributes["begin", ns].InnerText;
|
||||
}
|
||||
|
||||
string end = string.Empty;
|
||||
if (node.Attributes["end"] != null)
|
||||
{
|
||||
end = node.Attributes["end"].InnerText;
|
||||
}
|
||||
else if (node.Attributes["end", ns] != null)
|
||||
{
|
||||
end = node.Attributes["end", ns].InnerText;
|
||||
}
|
||||
|
||||
string dur = string.Empty;
|
||||
if (node.Attributes["dur"] != null)
|
||||
{
|
||||
dur = node.Attributes["dur"].InnerText;
|
||||
}
|
||||
else if (node.Attributes["dur", ns] != null)
|
||||
{
|
||||
dur = node.Attributes["dur", ns].InnerText;
|
||||
}
|
||||
|
||||
var startCode = new TimeCode(TimeSpan.FromSeconds(startSeconds));
|
||||
if (start != string.Empty)
|
||||
|
Loading…
Reference in New Issue
Block a user