diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-11-11 15:37:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-11 15:37:53 -0500 |
| commit | b4c6cad2fa9256c4af83752a34679d2533c96b11 (patch) | |
| tree | 43e25b4ed64a535823e21128ee74f3e0a1245069 /MediaBrowser.Model | |
| parent | 00316bc8ca9791f2ad68e84e29f2fbc6b1af2173 (diff) | |
| parent | 2b19df9544315603673ff034e8fd621cf0b85a4b (diff) | |
Merge pull request #2281 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/IO/IFileSystem.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Model/Services/IRequest.cs | 5 | ||||
| -rw-r--r-- | MediaBrowser.Model/System/Architecture.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.Model/System/IEnvironmentInfo.cs | 1 |
4 files changed, 5 insertions, 6 deletions
diff --git a/MediaBrowser.Model/IO/IFileSystem.cs b/MediaBrowser.Model/IO/IFileSystem.cs index d2bb355203..f219d92959 100644 --- a/MediaBrowser.Model/IO/IFileSystem.cs +++ b/MediaBrowser.Model/IO/IFileSystem.cs @@ -312,6 +312,8 @@ namespace MediaBrowser.Model.IO string GetFullPath(string path); List<FileSystemMetadata> GetDrives(); + + void SetExecutable(string path); } public enum FileOpenMode diff --git a/MediaBrowser.Model/Services/IRequest.cs b/MediaBrowser.Model/Services/IRequest.cs index 5dc995b06f..5a4d240074 100644 --- a/MediaBrowser.Model/Services/IRequest.cs +++ b/MediaBrowser.Model/Services/IRequest.cs @@ -120,11 +120,6 @@ namespace MediaBrowser.Model.Services public interface IResponse { - /// <summary> - /// The underlying ASP.NET or HttpListener HttpResponse - /// </summary> - object OriginalResponse { get; } - IRequest Request { get; } int StatusCode { get; set; } diff --git a/MediaBrowser.Model/System/Architecture.cs b/MediaBrowser.Model/System/Architecture.cs index 09eedddc13..73f78cd582 100644 --- a/MediaBrowser.Model/System/Architecture.cs +++ b/MediaBrowser.Model/System/Architecture.cs @@ -4,6 +4,7 @@ { X86 = 0, X64 = 1, - Arm = 2 + Arm = 2, + Arm64 = 3 } } diff --git a/MediaBrowser.Model/System/IEnvironmentInfo.cs b/MediaBrowser.Model/System/IEnvironmentInfo.cs index 3fcacb30d4..c5f493e7c9 100644 --- a/MediaBrowser.Model/System/IEnvironmentInfo.cs +++ b/MediaBrowser.Model/System/IEnvironmentInfo.cs @@ -11,6 +11,7 @@ namespace MediaBrowser.Model.System MediaBrowser.Model.System.OperatingSystem OperatingSystem { get; } string OperatingSystemName { get; } string OperatingSystemVersion { get; } + Architecture SystemArchitecture { get; } } public enum OperatingSystem |