diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-06-29 00:06:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-29 00:06:55 -0400 |
| commit | 04de5b15e6fbcee560140c8f1e2ecdd6665e50ee (patch) | |
| tree | 3f30c973d214f62856ad775d0bba7a5ca2508cfb /MediaBrowser.Server.Mono/Native/BaseMonoApp.cs | |
| parent | 8fe7315afab90470833b11db36d426959262ccfb (diff) | |
| parent | db1130166fb11b726bb37ae2ad2f3c9c1b82076a (diff) | |
Merge pull request #1886 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Server.Mono/Native/BaseMonoApp.cs')
| -rw-r--r-- | MediaBrowser.Server.Mono/Native/BaseMonoApp.cs | 42 |
1 files changed, 1 insertions, 41 deletions
diff --git a/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs b/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs index 5d7274356..19ae7b4d2 100644 --- a/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs +++ b/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs @@ -248,6 +248,7 @@ namespace MediaBrowser.Server.Mono.Native switch (environment.OperatingSystem) { + case OperatingSystem.Osx: case OperatingSystem.Bsd: break; case OperatingSystem.Linux: @@ -255,20 +256,6 @@ namespace MediaBrowser.Server.Mono.Native info.ArchiveType = "7z"; info.Version = "20160215"; break; - case OperatingSystem.Osx: - - info.ArchiveType = "7z"; - - switch (environment.SystemArchitecture) - { - case Architecture.X64: - info.Version = "20160124"; - break; - case Architecture.X86: - info.Version = "20150110"; - break; - } - break; } info.DownloadUrls = GetDownloadUrls(environment); @@ -280,23 +267,6 @@ namespace MediaBrowser.Server.Mono.Native { switch (environment.OperatingSystem) { - case OperatingSystem.Osx: - - switch (environment.SystemArchitecture) - { - case Architecture.X64: - return new[] - { - "https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/osx/ffmpeg-x64-2.8.5.7z" - }; - case Architecture.X86: - return new[] - { - "https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/osx/ffmpeg-x86-2.5.3.7z" - }; - } - break; - case OperatingSystem.Linux: switch (environment.SystemArchitecture) @@ -306,16 +276,6 @@ namespace MediaBrowser.Server.Mono.Native { "https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/linux/ffmpeg-git-20160215-64bit-static.7z" }; - case Architecture.X86: - return new[] - { - "https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/linux/ffmpeg-git-20160215-32bit-static.7z" - }; - case Architecture.Arm: - return new[] - { - "https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/linux/ffmpeg-arm.7z" - }; } break; } |