Merge branch 'master' of https://github.com/MediaBrowser/Emby

4 files changed, 1 insertions, 81 deletions

diff --git a/src/Emby.Server/CoreAppHost.cs b/src/Emby.Server/CoreAppHost.cs
index 09df664fa..43142b5e8 100644
--- a/src/Emby.Server/CoreAppHost.cs
+++ b/src/Emby.Server/CoreAppHost.cs
@@ -19,11 +19,6 @@ namespace Emby.Server
         {
         }
 
-        public override bool IsRunningAsService
-        {
-            get { return false; }
-        }
-
         protected override void RestartInternal()
         {
             Program.Restart();
@@ -34,41 +29,6 @@ namespace Emby.Server
             Program.Shutdown();
         }
 
-        protected override FFMpegInstallInfo GetFfmpegInstallInfo()
-        {
-            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>();
@@ -78,26 +38,6 @@ namespace Emby.Server
             return list;
         }
 
-        protected override void AuthorizeServer()
-        {
-        }
-
-        protected override void ConfigureAutoRunInternal(bool autorun)
-        {
-        }
-
-        protected override void EnableLoopbackInternal(string appName)
-        {
-        }
-
-        public override bool SupportsRunningAsService
-        {
-            get
-            {
-                return true;
-            }
-        }
-
         public override bool CanSelfRestart
         {
             get
@@ -106,14 +46,6 @@ namespace Emby.Server
             }
         }
 
-        public override bool SupportsAutoRunAtStartup
-        {
-            get
-            {
-                return true;
-            }
-        }
-
         public override bool CanSelfUpdate
         {
             get
@@ -121,13 +53,5 @@ namespace Emby.Server
                 return Program.CanSelfUpdate;
             }
         }
-
-        protected override bool SupportsDualModeSockets
-        {
-            get
-            {
-                return true;
-            }
-        }
     }
 }
diff --git a/src/Emby.Server/Emby.Server.xproj b/src/Emby.Server/Emby.Server.xproj
index 2462c5179..78276d17d 100644
--- a/src/Emby.Server/Emby.Server.xproj
+++ b/src/Emby.Server/Emby.Server.xproj
@@ -34,7 +34,6 @@
     <ProjectReference Include="..\..\MediaBrowser.XbmcMetadata\MediaBrowser.XbmcMetadata.csproj" />
     <ProjectReference Include="..\..\OpenSubtitlesHandler\OpenSubtitlesHandler.csproj" />
     <ProjectReference Include="..\..\RSSDP\RSSDP.csproj" />
-    <ProjectReference Include="..\..\ServiceStack\ServiceStack.csproj" />
     <ProjectReference Include="..\..\SocketHttpListener.Portable\SocketHttpListener.Portable.csproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Emby.Server/Program.cs b/src/Emby.Server/Program.cs
index fde2ab7b2..5e55cfa29 100644
--- a/src/Emby.Server/Program.cs
+++ b/src/Emby.Server/Program.cs
@@ -193,7 +193,7 @@ namespace Emby.Server
         /// <param name="options">The options.</param>
         private static void RunApplication(ServerApplicationPaths appPaths, ILogManager logManager, StartupOptions options, EnvironmentInfo environmentInfo)
         {
-            var fileSystem = new ManagedFileSystem(logManager.GetLogger("FileSystem"), true, true, true, appPaths.TempDirectory);
+            var fileSystem = new ManagedFileSystem(logManager.GetLogger("FileSystem"), true, true, false, appPaths.TempDirectory);
 
             fileSystem.AddShortcutHandler(new MbLinkShortcutHandler(fileSystem));
 
diff --git a/src/Emby.Server/project.json b/src/Emby.Server/project.json
index 83c9ce876..e1ff8cbcc 100644
--- a/src/Emby.Server/project.json
+++ b/src/Emby.Server/project.json
@@ -113,9 +113,6 @@
         "RSSDP": {
           "target": "project"
         },
-        "ServiceStack": {
-          "target": "project"
-        },
         "SocketHttpListener.Portable": {
           "target": "project"
         }