Luke Pulverenti 8 年之前
父节点
当前提交
1823b4a674

+ 1 - 6
Emby.Server.Core/ApplicationHost.cs

@@ -107,7 +107,6 @@ using Emby.Server.Implementations.Playlists;
 using Emby.Server.Implementations;
 using Emby.Server.Implementations.ServerManager;
 using Emby.Server.Implementations.Session;
-using Emby.Server.Implementations.Windows;
 using Emby.Server.Implementations.TV;
 using Emby.Server.Implementations.Updates;
 using MediaBrowser.Model.Activity;
@@ -1743,12 +1742,8 @@ namespace Emby.Server.Core
             ((IProcess)sender).Dispose();
         }
 
-        public void EnableLoopback(string appName)
+        public virtual void EnableLoopback(string appName)
         {
-            if (EnvironmentInfo.OperatingSystem == MediaBrowser.Model.System.OperatingSystem.Windows)
-            {
-                LoopUtil.Run(appName);
-            }
         }
 
         private void RegisterModules()

+ 0 - 1
Emby.Server.Implementations/Emby.Server.Implementations.csproj

@@ -267,7 +267,6 @@
     <Compile Include="Updates\InstallationManager.cs" />
     <Compile Include="UserViews\CollectionFolderImageProvider.cs" />
     <Compile Include="UserViews\DynamicImageProvider.cs" />
-    <Compile Include="Windows\LoopUtil.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Localization\iso6392.txt" />

+ 1 - 0
MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj

@@ -142,6 +142,7 @@
       <DependentUpon>MainForm.cs</DependentUpon>
     </Compile>
     <Compile Include="MainStartup.cs" />
+    <Compile Include="Native\LoopUtil.cs" />
     <Compile Include="Native\PowerManagement.cs" />
     <Compile Include="Native\Standby.cs" />
     <Compile Include="Native\ServerAuthorization.cs" />

+ 4 - 1
Emby.Server.Implementations/Windows/LoopUtil.cs → MediaBrowser.ServerApplication/Native/LoopUtil.cs

@@ -5,7 +5,10 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Emby.Server.Implementations.Windows
+/*
+ * Important - Even though this will compile in the shared projects, it will cause build failures within the mono runtime
+ */
+namespace MediaBrowser.ServerApplication.Native
 {
     /// <summary>
     /// http://blogs.msdn.com/b/fiddler/archive/2011/12/10/fiddler-windows-8-apps-enable-LoopUtil-network-isolation-exemption.aspx

+ 5 - 1
MediaBrowser.ServerApplication/WindowsAppHost.cs

@@ -11,7 +11,6 @@ using Emby.Server.Core;
 using Emby.Server.Implementations;
 using Emby.Server.Implementations.EntryPoints;
 using Emby.Server.Implementations.FFMpeg;
-using Emby.Server.Implementations.Windows;
 using Emby.Server.Sync;
 using MediaBrowser.Controller.Connect;
 using MediaBrowser.Controller.Sync;
@@ -49,6 +48,11 @@ namespace MediaBrowser.ServerApplication
             MainStartup.Restart();
         }
 
+        public override void EnableLoopback(string appName)
+        {
+            LoopUtil.Run(appName);
+        }
+
         protected override List<Assembly> GetAssembliesWithPartsInternal()
         {
             var list = new List<Assembly>();

+ 1 - 1
SharedVersion.cs

@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.2.8.8")]
+[assembly: AssemblyVersion("3.2.8.9")]