alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-02 13:58:29 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

update core projects

Browse Source
This commit is contained in:
Luke Pulverenti
2016-11-11 03:13:11 -05:00
parent f8dd02bb66
commit 918b9ca86d
13 changed files with 168 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.ServerApplication/MainStartup.cs
View File

@@ -17,6 +17,7 @@ using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
using Emby.Common.Implementations.EnvironmentInfo;
using Emby.Common.Implementations.IO;
using Emby.Common.Implementations.Logging;
using Emby.Server.Core;
@@ -324,7 +325,8 @@ namespace MediaBrowser.ServerApplication
fileSystem,
nativeApp,
new PowerManagement(),
"emby.windows.zip");
"emby.windows.zip",
new EnvironmentInfo());
var initProgress = new Progress<double>();

15
MediaBrowser.ServerApplication/Native/WindowsApp.cs
View File

@@ -14,8 +14,6 @@ using Emby.Server.Core.FFMpeg;
using MediaBrowser.Common.IO;
using MediaBrowser.Controller.IO;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.System;
using OperatingSystem = MediaBrowser.Server.Startup.Common.OperatingSystem;
namespace MediaBrowser.ServerApplication.Native
{
@@ -49,19 +47,6 @@ namespace MediaBrowser.ServerApplication.Native
ServerAuthorization.AuthorizeServer(udpPort, httpServerPort, httpsPort, applicationPath, tempDirectory);
}
public NativeEnvironment Environment
{
get
{
return new NativeEnvironment
{
OperatingSystem = OperatingSystem.Windows,
SystemArchitecture = System.Environment.Is64BitOperatingSystem ? Architecture.X64 : Architecture.X86,
OperatingSystemVersionString = System.Environment.OSVersion.VersionString
};
}
}
public bool SupportsLibraryMonitor
{
get { return true; }