diff options
Diffstat (limited to 'src/Emby.Server/CoreAppHost.cs')
| -rw-r--r-- | src/Emby.Server/CoreAppHost.cs | 43 |
1 files changed, 37 insertions, 6 deletions
diff --git a/src/Emby.Server/CoreAppHost.cs b/src/Emby.Server/CoreAppHost.cs index 5291f20ef..09df664fa 100644 --- a/src/Emby.Server/CoreAppHost.cs +++ b/src/Emby.Server/CoreAppHost.cs @@ -4,8 +4,7 @@ using System.Linq; using System.Reflection; using System.Threading.Tasks; using Emby.Server.Core; -using Emby.Server.Core.FFMpeg; -using Emby.Server.Data; +using Emby.Server.Implementations.FFMpeg; using MediaBrowser.Model.IO; using MediaBrowser.Model.Logging; using MediaBrowser.Model.System; @@ -39,9 +38,37 @@ namespace Emby.Server { var info = new FFMpegInstallInfo(); + if (EnvironmentInfo.OperatingSystem == OperatingSystem.Windows) + { + info.FFMpegFilename = "ffmpeg.exe"; + info.FFProbeFilename = "ffprobe.exe"; + info.Version = "20160410"; + info.ArchiveType = "7z"; + info.DownloadUrls = GetDownloadUrls(); + } + return info; } + private string[] GetDownloadUrls() + { + switch (EnvironmentInfo.SystemArchitecture) + { + case Architecture.X64: + return new[] + { + "https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/windows/ffmpeg-20160410-win64.7z" + }; + case Architecture.X86: + return new[] + { + "https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/windows/ffmpeg-20160410-win32.7z" + }; + } + + return new string[] { }; + } + protected override List<Assembly> GetAssembliesWithPartsInternal() { var list = new List<Assembly>(); @@ -59,10 +86,6 @@ namespace Emby.Server { } - public override void LaunchUrl(string url) - { - } - protected override void EnableLoopbackInternal(string appName) { } @@ -98,5 +121,13 @@ namespace Emby.Server return Program.CanSelfUpdate; } } + + protected override bool SupportsDualModeSockets + { + get + { + return true; + } + } } } |