aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api/Subtitles/SubtitleService.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-08-22 11:47:44 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-08-22 11:47:44 -0400
commit21d88faa187f89854f2ab5f5146baea70b6bc118 (patch)
tree58b85677968f1f5a7f61b00380f072f88ce51958 /MediaBrowser.Api/Subtitles/SubtitleService.cs
parentca66390e2445c94c769d19d601c88fe2f79f901a (diff)
added json subtitle output
Diffstat (limited to 'MediaBrowser.Api/Subtitles/SubtitleService.cs')
-rw-r--r--MediaBrowser.Api/Subtitles/SubtitleService.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/MediaBrowser.Api/Subtitles/SubtitleService.cs b/MediaBrowser.Api/Subtitles/SubtitleService.cs
index dc5799239..6e2882319 100644
--- a/MediaBrowser.Api/Subtitles/SubtitleService.cs
+++ b/MediaBrowser.Api/Subtitles/SubtitleService.cs
@@ -174,12 +174,16 @@ namespace MediaBrowser.Api.Subtitles
}
builder.AppendLine("#EXT-X-ENDLIST");
-
+
return ResultFactory.GetResult(builder.ToString(), Common.Net.MimeTypes.GetMimeType("playlist.m3u8"), new Dictionary<string, string>());
}
public object Get(GetSubtitle request)
{
+ if (string.Equals(request.Format, "js", StringComparison.OrdinalIgnoreCase))
+ {
+ request.Format = "json";
+ }
if (string.IsNullOrEmpty(request.Format))
{
var item = (Video)_libraryManager.GetItemById(new Guid(request.Id));