From 9932db8400e4bd40b448d79fc0998b19b2c29ce3 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 15 Feb 2017 16:18:56 -0500 Subject: [PATCH 1/2] fix direct stream of flv --- MediaBrowser.Api/Playback/Progressive/VideoService.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MediaBrowser.Api/Playback/Progressive/VideoService.cs b/MediaBrowser.Api/Playback/Progressive/VideoService.cs index 3c614567bc..bc600d3ea8 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 { From db7e78640ae94622cd8feb9f84b35e9f85f18c82 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 15 Feb 2017 16:19:07 -0500 Subject: [PATCH 2/2] improve series recording images --- Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs | 7 +++++++ SharedVersion.cs | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs b/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs index e73378ddeb..43b055098a 100644 --- a/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs +++ b/Emby.Server.Implementations/LiveTv/LiveTvDtoService.cs @@ -277,6 +277,13 @@ namespace Emby.Server.Implementations.LiveTv if (!string.IsNullOrWhiteSpace(programSeriesId)) { 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, diff --git a/SharedVersion.cs b/SharedVersion.cs index 0f38b8ab21..bf8993ed65 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")]