mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-07 20:08:59 +02:00
Merge branch 'master' of https://github.com/MediaBrowser/Emby
This commit is contained in:
commit
3a9a16199d
2 changed files with 30 additions and 6 deletions
|
@ -7,6 +7,7 @@ using System.Collections.Generic;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using MediaBrowser.Controller.Power;
|
using MediaBrowser.Controller.Power;
|
||||||
|
using MediaBrowser.Server.Implementations.Persistence;
|
||||||
using MediaBrowser.Server.Startup.Common.FFMpeg;
|
using MediaBrowser.Server.Startup.Common.FFMpeg;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
|
|
||||||
|
@ -14,6 +15,13 @@ namespace MediaBrowser.Server.Mac
|
||||||
{
|
{
|
||||||
public abstract class BaseMonoApp : INativeApp
|
public abstract class BaseMonoApp : INativeApp
|
||||||
{
|
{
|
||||||
|
protected ILogger Logger { get; private set; }
|
||||||
|
|
||||||
|
protected BaseMonoApp(ILogger logger)
|
||||||
|
{
|
||||||
|
Logger = logger;
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Shutdowns this instance.
|
/// Shutdowns this instance.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -39,6 +47,21 @@ namespace MediaBrowser.Server.Mac
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void PreventSystemStandby()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public void AllowSystemStandby()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public IDbConnector GetDbConnector()
|
||||||
|
{
|
||||||
|
return new DbConnector(Logger);
|
||||||
|
}
|
||||||
|
|
||||||
public virtual bool SupportsLibraryMonitor
|
public virtual bool SupportsLibraryMonitor
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
|
@ -64,11 +87,6 @@ namespace MediaBrowser.Server.Mac
|
||||||
get { return false; }
|
get { return false; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public void PreventSystemStandby()
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<Assembly> GetAssembliesWithParts()
|
public List<Assembly> GetAssembliesWithParts()
|
||||||
{
|
{
|
||||||
var list = new List<Assembly>();
|
var list = new List<Assembly>();
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
using System;
|
using System;
|
||||||
using MediaBrowser.Server.Startup.Common;
|
using MediaBrowser.Server.Startup.Common;
|
||||||
|
using MediaBrowser.Model.Logging;
|
||||||
|
|
||||||
namespace MediaBrowser.Server.Mac
|
namespace MediaBrowser.Server.Mac
|
||||||
{
|
{
|
||||||
|
@ -8,7 +9,12 @@ namespace MediaBrowser.Server.Mac
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class NativeApp : BaseMonoApp
|
public class NativeApp : BaseMonoApp
|
||||||
{
|
{
|
||||||
/// <summary>
|
public NativeApp(ILogger logger)
|
||||||
|
: base(logger)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
/// Shutdowns this instance.
|
/// Shutdowns this instance.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public override void Shutdown()
|
public override void Shutdown()
|
||||||
|
|
Loading…
Reference in a new issue