diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-02-15 16:19:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-15 16:19:25 -0500 |
| commit | d14253249dd048b8e31b92dee71fd4932a61878c (patch) | |
| tree | 9d0a823f75482e02bf093e4cc6e68a026df2ad91 | |
| parent | f1f910252c999ea407dd0ebe6142f349a31b0c23 (diff) | |
| parent | db7e78640ae94622cd8feb9f84b35e9f85f18c82 (diff) | |
Merge pull request #2472 from MediaBrowser/dev
Dev
| -rw-r--r-- | Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs | 7 | ||||
| -rw-r--r-- | MediaBrowser.Api/Playback/Progressive/VideoService.cs | 2 | ||||
| -rw-r--r-- | SharedVersion.cs | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs b/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs index e73378dde..43b055098 100644 --- a/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs +++ b/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs @@ -278,6 +278,13 @@ namespace Emby.Server.Implementations.LiveTv { var program = _libraryManager.GetItemList(new InternalItemsQuery { + IncludeItemTypes = new string[] { typeof(Series).Name }, + Name = seriesName, + Limit = 1, + ImageTypes = new ImageType[] { ImageType.Primary } + + }).FirstOrDefault() ?? _libraryManager.GetItemList(new InternalItemsQuery + { IncludeItemTypes = new string[] { typeof(LiveTvProgram).Name }, ExternalSeriesId = programSeriesId, Limit = 1, diff --git a/MediaBrowser.Api/Playback/Progressive/VideoService.cs b/MediaBrowser.Api/Playback/Progressive/VideoService.cs index 3c614567b..bc600d3ea 100644 --- a/MediaBrowser.Api/Playback/Progressive/VideoService.cs +++ b/MediaBrowser.Api/Playback/Progressive/VideoService.cs @@ -41,6 +41,7 @@ namespace MediaBrowser.Api.Playback.Progressive [Route("/Videos/{Id}/stream.wtv", "GET")] [Route("/Videos/{Id}/stream.mov", "GET")] [Route("/Videos/{Id}/stream.iso", "GET")] + [Route("/Videos/{Id}/stream.flv", "GET")] [Route("/Videos/{Id}/stream", "GET")] [Route("/Videos/{Id}/stream.ts", "HEAD")] [Route("/Videos/{Id}/stream.webm", "HEAD")] @@ -59,6 +60,7 @@ namespace MediaBrowser.Api.Playback.Progressive [Route("/Videos/{Id}/stream.m2ts", "HEAD")] [Route("/Videos/{Id}/stream.mov", "HEAD")] [Route("/Videos/{Id}/stream.iso", "HEAD")] + [Route("/Videos/{Id}/stream.flv", "HEAD")] [Route("/Videos/{Id}/stream", "HEAD")] public class GetVideoStream : VideoStreamRequest { diff --git a/SharedVersion.cs b/SharedVersion.cs index 0f38b8ab2..bf8993ed6 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.1.106")] +[assembly: AssemblyVersion("3.2.1.107")] |