Merge pull request #2228 from MediaBrowser/dev

Dev

MediaBrowser.Model/LiveTv/RecordingStatus.cs

@@ -4,7 +4,6 @@ namespace MediaBrowser.Model.LiveTv
     public enum RecordingStatus
     {
         New,
-        Scheduled,
         InProgress,
         Completed,
         Cancelled,

MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs

@@ -100,7 +100,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
             container.Adapter = _containerAdapter;
 
             Plugins.RemoveAll(x => x is NativeTypesFeature);
-            //Plugins.Add(new SwaggerFeature());
+            Plugins.Add(new SwaggerFeature());
             Plugins.Add(new CorsFeature(allowedHeaders: "Content-Type, Authorization, Range, X-MediaBrowser-Token, X-Emby-Authorization"));
 
             //Plugins.Add(new AuthFeature(() => new AuthUserSession(), new IAuthProvider[] {

MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs

@@ -761,6 +761,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
             {
                 defaults.SeriesId = program.SeriesId;
                 defaults.ProgramId = program.Id;
+                defaults.RecordNewOnly = !program.IsRepeat;
             }
 
             defaults.SkipEpisodesInLibrary = true;

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

@@ -112,8 +112,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts
             }
 
             channel.ImageUrl = FindProperty("tvg-logo", extInf, null);
-            channel.Number = FindProperty("tvg-id", extInf, channel.Number);
             channel.Number = FindProperty("channel-id", extInf, channel.Number);
+            channel.Number = FindProperty("tvg-id", extInf, channel.Number);
             channel.Name = FindProperty("tvg-name", extInf, channel.Name);
             channel.Name = FindProperty("tvg-id", extInf, channel.Name);
             return channel;

MediaBrowser.Server.Mac/Emby.Server.Mac.csproj

@@ -35,7 +35,7 @@
     <UseRefCounting>false</UseRefCounting>
     <Profiling>false</Profiling>
     <HttpClientHandler>HttpClientHandler</HttpClientHandler>
-    <TlsProvider>Legacy</TlsProvider>
+    <TlsProvider>Default</TlsProvider>
     <LinkMode>None</LinkMode>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>

MediaBrowser.Server.Startup.Common/ApplicationHost.cs

@@ -1306,7 +1306,7 @@ namespace MediaBrowser.Server.Startup.Common
                 EncoderLocationType = MediaEncoder.EncoderLocationType,
                 SystemArchitecture = NativeApp.Environment.SystemArchitecture,
                 SystemUpdateLevel = ConfigurationManager.CommonConfiguration.SystemUpdateLevel,
-                PackageName = _startupOptions.GetOption("package")
+                PackageName = _startupOptions.GetOption("-package")
             };
         }