michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev

Browse Source
This commit is contained in:
Tavares André 2015-04-18 15:45:12 +02:00
commit c230dab0bd
5 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Api/ApiEntryPoint.cs
View File

@ -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

4
MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
View File

@ -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)

10
MediaBrowser.Controller/LiveTv/LiveTvTunerInfo.cs
View File

@ -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
/// <value>The identifier.</value>
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>

6
MediaBrowser.Model/LiveTv/LiveTvTunerInfoDto.cs
View File

@ -22,6 +22,12 @@ namespace MediaBrowser.Model.LiveTv
/// <value>The identifier.</value>
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>

3
MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
View File

@ -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))