diff options
Diffstat (limited to 'MediaBrowser.Controller/Xml/BaseItemXmlParser.cs')
| -rw-r--r-- | MediaBrowser.Controller/Xml/BaseItemXmlParser.cs | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/MediaBrowser.Controller/Xml/BaseItemXmlParser.cs b/MediaBrowser.Controller/Xml/BaseItemXmlParser.cs index d39ec6082..50520ac25 100644 --- a/MediaBrowser.Controller/Xml/BaseItemXmlParser.cs +++ b/MediaBrowser.Controller/Xml/BaseItemXmlParser.cs @@ -321,8 +321,15 @@ namespace MediaBrowser.Controller.Xml break;
case "Subtitle":
- FetchMediaInfoSubtitles(reader.ReadSubtree(), item);
- break;
+ {
+ SubtitleStream stream = FetchMediaInfoSubtitles(reader.ReadSubtree());
+
+ List<SubtitleStream> streams = (item.Subtitles ?? new SubtitleStream[] { }).ToList();
+ streams.Add(stream);
+ item.Subtitles = streams;
+
+ break;
+ }
default:
reader.Skip();
@@ -348,10 +355,6 @@ namespace MediaBrowser.Controller.Xml stream.IsDefault = reader.ReadElementContentAsString() == "True";
break;
- case "Forced":
- stream.IsForced = reader.ReadElementContentAsString() == "True";
- break;
-
case "BitRate":
stream.BitRate = reader.ReadIntSafe();
break;
@@ -451,9 +454,9 @@ namespace MediaBrowser.Controller.Xml }
}
- private void FetchMediaInfoSubtitles(XmlReader reader, Video item)
+ private SubtitleStream FetchMediaInfoSubtitles(XmlReader reader)
{
- List<string> list = (item.Subtitles ?? new string[] { }).ToList();
+ SubtitleStream stream = new SubtitleStream();
reader.MoveToContent();
@@ -464,15 +467,16 @@ namespace MediaBrowser.Controller.Xml switch (reader.Name)
{
case "Language":
- {
- string genre = reader.ReadElementContentAsString();
+ stream.Language = reader.ReadElementContentAsString();
+ break;
- if (!string.IsNullOrWhiteSpace(genre))
- {
- list.Add(genre);
- }
- break;
- }
+ case "Default":
+ stream.IsDefault = reader.ReadElementContentAsString() == "True";
+ break;
+
+ case "Forced":
+ stream.IsForced = reader.ReadElementContentAsString() == "True";
+ break;
default:
reader.Skip();
@@ -481,7 +485,7 @@ namespace MediaBrowser.Controller.Xml }
}
- item.Subtitles = list;
+ return stream;
}
private void FetchFromTaglinesNode(XmlReader reader, T item)
|