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

Merge pull request #2539 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2017-03-22 14:37:23 -04:00 committed by GitHub
commit 2e1ca1c1e6
6 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Emby.Server.Core/ApplicationHost.cs
View File

@ -107,7 +107,6 @@ using Emby.Server.Implementations.Playlists;
using Emby.Server.Implementations; using Emby.Server.Implementations;
using Emby.Server.Implementations.ServerManager; using Emby.Server.Implementations.ServerManager;
using Emby.Server.Implementations.Session; using Emby.Server.Implementations.Session;
using Emby.Server.Implementations.Windows;
using Emby.Server.Implementations.TV; using Emby.Server.Implementations.TV;
using Emby.Server.Implementations.Updates; using Emby.Server.Implementations.Updates;
using MediaBrowser.Model.Activity; using MediaBrowser.Model.Activity;
@ -1743,12 +1742,8 @@ namespace Emby.Server.Core
((IProcess)sender).Dispose(); ((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() private void RegisterModules()

1
Emby.Server.Implementations/Emby.Server.Implementations.csproj
View File

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

1
MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
View File

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

5
Emby.Server.Implementations/Windows/LoopUtil.cs → MediaBrowser.ServerApplication/Native/LoopUtil.cs
View File

@ -5,7 +5,10 @@ using System.Runtime.InteropServices;
using System.Text; using System.Text;
using System.Threading.Tasks; 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> /// <summary>
/// http://blogs.msdn.com/b/fiddler/archive/2011/12/10/fiddler-windows-8-apps-enable-LoopUtil-network-isolation-exemption.aspx /// http://blogs.msdn.com/b/fiddler/archive/2011/12/10/fiddler-windows-8-apps-enable-LoopUtil-network-isolation-exemption.aspx

6
MediaBrowser.ServerApplication/WindowsAppHost.cs
View File

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

2
SharedVersion.cs
View File

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