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

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

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)

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

MediaBrowser.Model/LiveTv/LiveTvTunerInfoDto.cs

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

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