Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-25 04:33:04 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/SubtitleEdit/subtitleedit

Browse Source
This commit is contained in:
niksedk 2021-12-11 14:55:18 +01:00
commit e864dbbe18
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ui/Forms/TimedTextProperties.cs
View File

@ -10,10 +10,10 @@ namespace Nikse.SubtitleEdit.Forms
{ {
public partial class TimedTextProperties : PositionAndSizeForm public partial class TimedTextProperties : PositionAndSizeForm
{ {
private Subtitle _subtitle; private readonly Subtitle _subtitle;
private XmlDocument _xml; private readonly XmlDocument _xml;
private XmlNamespaceManager _nsmgr; private readonly XmlNamespaceManager _nsmgr;
private string _NA; private readonly string _NA;
public TimedTextProperties(Subtitle subtitle) public TimedTextProperties(Subtitle subtitle)
{ {
@ -40,7 +40,10 @@ namespace Nikse.SubtitleEdit.Forms
_xml.LoadXml(subtitle.Header); // load default xml _xml.LoadXml(subtitle.Header); // load default xml
} }
_nsmgr = new XmlNamespaceManager(_xml.NameTable); _nsmgr = new XmlNamespaceManager(_xml.NameTable);
_nsmgr.AddNamespace("ttml", "http://www.w3.org/ns/ttml"); _nsmgr.AddNamespace("ttml", TimedText10.TtmlNamespace);
_nsmgr.AddNamespace("ttp", TimedText10.TtmlParameterNamespace);
_nsmgr.AddNamespace("tts", TimedText10.TtmlStylingNamespace);
_nsmgr.AddNamespace("ttm", TimedText10.TtmlMetadataNamespace);
XmlNode node = _xml.DocumentElement.SelectSingleNode("ttml:head/ttml:metadata/ttml:title", _nsmgr); XmlNode node = _xml.DocumentElement.SelectSingleNode("ttml:head/ttml:metadata/ttml:title", _nsmgr);
if (node != null) if (node != null)

13
src/ui/Forms/TimedTextPropertiesItunes.cs
View File

@ -10,10 +10,10 @@ namespace Nikse.SubtitleEdit.Forms
{ {
public partial class TimedTextPropertiesItunes : PositionAndSizeForm public partial class TimedTextPropertiesItunes : PositionAndSizeForm
{ {
private Subtitle _subtitle; private readonly Subtitle _subtitle;
private XmlDocument _xml; private readonly XmlDocument _xml;
private XmlNamespaceManager _nsmgr; private readonly XmlNamespaceManager _nsmgr;
private string _NA; private readonly string _NA;
public TimedTextPropertiesItunes(Subtitle subtitle) public TimedTextPropertiesItunes(Subtitle subtitle)
{ {
@ -40,7 +40,10 @@ namespace Nikse.SubtitleEdit.Forms
_xml.LoadXml(subtitle.Header); // load default xml _xml.LoadXml(subtitle.Header); // load default xml
} }
_nsmgr = new XmlNamespaceManager(_xml.NameTable); _nsmgr = new XmlNamespaceManager(_xml.NameTable);
_nsmgr.AddNamespace("ttml", "http://www.w3.org/ns/ttml"); _nsmgr.AddNamespace("ttml", TimedText10.TtmlNamespace);
_nsmgr.AddNamespace("ttp", TimedText10.TtmlParameterNamespace);
_nsmgr.AddNamespace("tts", TimedText10.TtmlStylingNamespace);
_nsmgr.AddNamespace("ttm", TimedText10.TtmlMetadataNamespace);
XmlNode node = _xml.DocumentElement.SelectSingleNode("ttml:head/ttml:metadata/ttml:title", _nsmgr); XmlNode node = _xml.DocumentElement.SelectSingleNode("ttml:head/ttml:metadata/ttml:title", _nsmgr);
if (node != null) if (node != null)