diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-06-23 13:05:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-23 13:05:53 -0400 |
| commit | cc9145b398b2f08a4b1a7219e0acf4176dce849f (patch) | |
| tree | b7b6cf788ecdcb9b193928e9ba538380ff59972b /MediaBrowser.Server.Mono/Native/BaseMonoApp.cs | |
| parent | 2eee5c8a15f789557b9834f98872e0bcb33d52de (diff) | |
| parent | cffc9417c7a25263a194615096685bd8ef1e37b2 (diff) | |
Merge pull request #1873 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Server.Mono/Native/BaseMonoApp.cs')
| -rw-r--r-- | MediaBrowser.Server.Mono/Native/BaseMonoApp.cs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs b/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs index a012a19a3..5d7274356 100644 --- a/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs +++ b/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs @@ -9,6 +9,7 @@ using System.Collections.Generic; using System.Reflection; using System.Text.RegularExpressions; using MediaBrowser.Controller.Power; +using MediaBrowser.Model.System; using MediaBrowser.Server.Implementations.Persistence; using MediaBrowser.Server.Startup.Common.FFMpeg; using OperatingSystem = MediaBrowser.Server.Startup.Common.OperatingSystem; @@ -176,7 +177,7 @@ namespace MediaBrowser.Server.Mono.Native } else if (string.Equals(uname.machine, "x86_64", StringComparison.OrdinalIgnoreCase)) { - info.SystemArchitecture = Architecture.X86_X64; + info.SystemArchitecture = Architecture.X64; } else if (uname.machine.StartsWith("arm", StringComparison.OrdinalIgnoreCase)) { @@ -260,7 +261,7 @@ namespace MediaBrowser.Server.Mono.Native switch (environment.SystemArchitecture) { - case Architecture.X86_X64: + case Architecture.X64: info.Version = "20160124"; break; case Architecture.X86: @@ -283,7 +284,7 @@ namespace MediaBrowser.Server.Mono.Native switch (environment.SystemArchitecture) { - case Architecture.X86_X64: + case Architecture.X64: return new[] { "https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/osx/ffmpeg-x64-2.8.5.7z" @@ -300,7 +301,7 @@ namespace MediaBrowser.Server.Mono.Native switch (environment.SystemArchitecture) { - case Architecture.X86_X64: + case Architecture.X64: return new[] { "https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/linux/ffmpeg-git-20160215-64bit-static.7z" |