diff options
Diffstat (limited to 'MediaBrowser.Server.Mono')
4 files changed, 1 insertions, 39 deletions
diff --git a/MediaBrowser.Server.Mono/Diagnostics/LinuxProcessManager.cs b/MediaBrowser.Server.Mono/Diagnostics/LinuxProcessManager.cs deleted file mode 100644 index a66365212..000000000 --- a/MediaBrowser.Server.Mono/Diagnostics/LinuxProcessManager.cs +++ /dev/null @@ -1,25 +0,0 @@ -using MediaBrowser.Controller.Diagnostics; -using System.Diagnostics; - -namespace MediaBrowser.Server.Mono.Diagnostics -{ - public class LinuxProcessManager : IProcessManager - { - public bool SupportsSuspension - { - get { return true; } - } - - public void SuspendProcess(Process process) - { - // http://jumptuck.com/2011/11/23/quick-tip-pause-process-linux/ - process.StandardInput.WriteLine("^Z"); - } - - public void ResumeProcess(Process process) - { - // http://jumptuck.com/2011/11/23/quick-tip-pause-process-linux/ - process.StandardInput.WriteLine("fg"); - } - } -} diff --git a/MediaBrowser.Server.Mono/ImageMagickSharp.dll.config b/MediaBrowser.Server.Mono/ImageMagickSharp.dll.config index ac4918ef2..a83ca85c9 100644 --- a/MediaBrowser.Server.Mono/ImageMagickSharp.dll.config +++ b/MediaBrowser.Server.Mono/ImageMagickSharp.dll.config @@ -1,4 +1,5 @@ <configuration> <dllmap dll="CORE_RL_Wand_.dll" target="libMagickWand-6.Q8.so" os="linux"/> + <dllmap dll="CORE_RL_Wand_.dll" target="libMagickWand-6.so" os="freebsd,openbsd,netbsd"/> <dllmap dll="CORE_RL_Wand_.dll" target="./MediaInfo/osx/libmediainfo.dylib" os="osx"/> </configuration>
\ No newline at end of file diff --git a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj index 8f552ee36..cd010e1c1 100644 --- a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj +++ b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj @@ -74,7 +74,6 @@ <Compile Include="..\SharedVersion.cs"> <Link>Properties\SharedVersion.cs</Link> </Compile> - <Compile Include="Diagnostics\LinuxProcessManager.cs" /> <Compile Include="Native\BaseMonoApp.cs" /> <Compile Include="Networking\CertificateGenerator.cs" /> <Compile Include="Program.cs" /> diff --git a/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs b/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs index 139661aa2..1ec0109ad 100644 --- a/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs +++ b/MediaBrowser.Server.Mono/Native/BaseMonoApp.cs @@ -1,8 +1,6 @@ using MediaBrowser.Common.Net; -using MediaBrowser.Controller.Diagnostics; using MediaBrowser.IsoMounter; using MediaBrowser.Model.Logging; -using MediaBrowser.Server.Mono.Diagnostics; using MediaBrowser.Server.Mono.Networking; using MediaBrowser.Server.Startup.Common; using Mono.Unix.Native; @@ -191,16 +189,5 @@ namespace MediaBrowser.Server.Mono.Native public string sysname = string.Empty; public string machine = string.Empty; } - - - public IProcessManager GetProcessManager() - { - if (Environment.OperatingSystem == Startup.Common.OperatingSystem.Linux) - { - return new LinuxProcessManager(); - } - - return new ProcessManager(); - } } } |