merge from dev

MediaBrowser.Server.Implementations/Channels/ChannelManager.cs

@@ -1534,4 +1534,4 @@ namespace MediaBrowser.Server.Implementations.Channels
             }
         }
     }
-}
+}

MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp.cs

@@ -1,54 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Controller.LiveTv;
-using MediaBrowser.Controller.MediaEncoding;
-using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.LiveTv;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Serialization;
-
-namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts
-{
-    public class SatIp : BaseTunerHost
-    {
-        public SatIp(IConfigurationManager config, ILogger logger, IJsonSerializer jsonSerializer, IMediaEncoder mediaEncoder)
-            : base(config, logger, jsonSerializer, mediaEncoder)
-        {
-        }
-
-        protected override Task<IEnumerable<ChannelInfo>> GetChannelsInternal(TunerHostInfo tuner, CancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
-        }
-
-        public override string Type
-        {
-            get { return "SatIp"; }
-        }
-
-        protected override Task<List<MediaSourceInfo>> GetChannelStreamMediaSources(TunerHostInfo tuner, string channelId, CancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
-        }
-
-        protected override Task<MediaSourceInfo> GetChannelStream(TunerHostInfo tuner, string channelId, string streamId, CancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
-        }
-
-        protected override Task<bool> IsAvailableInternal(TunerHostInfo tuner, string channelId, CancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
-        }
-
-        protected override bool IsValidChannelId(string channelId)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}