diff --git a/MediaBrowser.Api/ApiEntryPoint.cs b/MediaBrowser.Api/ApiEntryPoint.cs index e91dd1a9b0..c7f470427e 100644 --- a/MediaBrowser.Api/ApiEntryPoint.cs +++ b/MediaBrowser.Api/ApiEntryPoint.cs @@ -339,7 +339,7 @@ namespace MediaBrowser.Api // We can really reduce the timeout for apps that are using the newer api if (!string.IsNullOrWhiteSpace(job.PlaySessionId) && job.Type != TranscodingJobType.Progressive) { - timerDuration = 20000; + timerDuration = 60000; } // Don't start the timer for playback checkins with progressive streaming diff --git a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs index 1b11f1f337..a55f54d3c8 100644 --- a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs +++ b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs @@ -543,7 +543,9 @@ namespace MediaBrowser.Api.Playback.Hls return false; } - return state.VideoRequest.VideoBitRate.HasValue; + // Having problems in android + return false; + //return state.VideoRequest.VideoBitRate.HasValue; } private void AppendPlaylist(StringBuilder builder, string url, int bitrate, string subtitleGroup) diff --git a/MediaBrowser.Controller/LiveTv/LiveTvTunerInfo.cs b/MediaBrowser.Controller/LiveTv/LiveTvTunerInfo.cs index cdf2f0ef52..46cf4dd98c 100644 --- a/MediaBrowser.Controller/LiveTv/LiveTvTunerInfo.cs +++ b/MediaBrowser.Controller/LiveTv/LiveTvTunerInfo.cs @@ -1,5 +1,5 @@ -using System.Collections.Generic; -using MediaBrowser.Model.LiveTv; +using MediaBrowser.Model.LiveTv; +using System.Collections.Generic; namespace MediaBrowser.Controller.LiveTv { @@ -23,6 +23,12 @@ namespace MediaBrowser.Controller.LiveTv /// The identifier. public string Id { get; set; } + /// + /// Gets or sets the URL. + /// + /// The URL. + public string Url { get; set; } + /// /// Gets or sets the status. /// diff --git a/MediaBrowser.Model/LiveTv/LiveTvTunerInfoDto.cs b/MediaBrowser.Model/LiveTv/LiveTvTunerInfoDto.cs index 28e8c158ae..fcb19427ba 100644 --- a/MediaBrowser.Model/LiveTv/LiveTvTunerInfoDto.cs +++ b/MediaBrowser.Model/LiveTv/LiveTvTunerInfoDto.cs @@ -22,6 +22,12 @@ namespace MediaBrowser.Model.LiveTv /// The identifier. public string Id { get; set; } + /// + /// Gets or sets the URL. + /// + /// The URL. + public string Url { get; set; } + /// /// Gets or sets the status. /// diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs index 61017ffb35..00c15fdfcc 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs @@ -293,7 +293,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv ProgramName = info.ProgramName, SourceType = info.SourceType, Status = info.Status, - ChannelName = channelName + ChannelName = channelName, + Url = info.Url }; if (!string.IsNullOrEmpty(info.ChannelId))