diff options
| author | Tavares André <tavares_and@hotmail.com> | 2015-04-18 15:45:12 +0200 |
|---|---|---|
| committer | Tavares André <tavares_and@hotmail.com> | 2015-04-18 15:45:12 +0200 |
| commit | c230dab0bd3ce929992b6452b63ebe55e2d906bd (patch) | |
| tree | 8c92e9edf3d0194499a5bc4e8a630083ff40562d | |
| parent | a25f542bcb7841e31baa608526875de178beb935 (diff) | |
| parent | b5218034acb3149b6b5db658120611ba1469d8bb (diff) | |
Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev
5 files changed, 20 insertions, 5 deletions
diff --git a/MediaBrowser.Api/ApiEntryPoint.cs b/MediaBrowser.Api/ApiEntryPoint.cs index e91dd1a9b..c7f470427 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 1b11f1f33..a55f54d3c 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 cdf2f0ef5..46cf4dd98 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 { @@ -24,6 +24,12 @@ namespace MediaBrowser.Controller.LiveTv public string Id { get; set; } /// <summary> + /// Gets or sets the URL. + /// </summary> + /// <value>The URL.</value> + public string Url { get; set; } + + /// <summary> /// Gets or sets the status. /// </summary> /// <value>The status.</value> diff --git a/MediaBrowser.Model/LiveTv/LiveTvTunerInfoDto.cs b/MediaBrowser.Model/LiveTv/LiveTvTunerInfoDto.cs index 28e8c158a..fcb19427b 100644 --- a/MediaBrowser.Model/LiveTv/LiveTvTunerInfoDto.cs +++ b/MediaBrowser.Model/LiveTv/LiveTvTunerInfoDto.cs @@ -23,6 +23,12 @@ namespace MediaBrowser.Model.LiveTv public string Id { get; set; } /// <summary> + /// Gets or sets the URL. + /// </summary> + /// <value>The URL.</value> + public string Url { get; set; } + + /// <summary> /// Gets or sets the status. /// </summary> /// <value>The status.</value> diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs index 61017ffb3..00c15fdfc 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)) |