aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.ServerApplication
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-11-13 22:44:54 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-11-13 22:44:54 -0500
commit635c8d50a361dc2eabbeea0ae55048d1e9f4ad8f (patch)
treeebcf01208a34c24215416bdae32e66eab1438e6a /MediaBrowser.ServerApplication
parent0e9cd51f9c64d4cfad5cb5c7b0ddae6af8d18ac6 (diff)
update character escaping
Diffstat (limited to 'MediaBrowser.ServerApplication')
-rw-r--r--MediaBrowser.ServerApplication/WindowsAppHost.cs25
1 files changed, 23 insertions, 2 deletions
diff --git a/MediaBrowser.ServerApplication/WindowsAppHost.cs b/MediaBrowser.ServerApplication/WindowsAppHost.cs
index d9bead6b7..fa18b5229 100644
--- a/MediaBrowser.ServerApplication/WindowsAppHost.cs
+++ b/MediaBrowser.ServerApplication/WindowsAppHost.cs
@@ -32,11 +32,32 @@ namespace MediaBrowser.ServerApplication
info.FFMpegFilename = "ffmpeg.exe";
info.FFProbeFilename = "ffprobe.exe";
- info.Version = "0";
+ 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 void RestartInternal()
{
MainStartup.Restart();
@@ -80,7 +101,7 @@ namespace MediaBrowser.ServerApplication
var shortcutPath = Path.Combine(System.Environment.GetFolderPath(System.Environment.SpecialFolder.StartMenu), "Emby", "Emby Server.lnk");
var startupPath = System.Environment.GetFolderPath(System.Environment.SpecialFolder.Startup);
-
+
if (autorun)
{
//Copy our shortut into the startup folder for this user