diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-06-23 13:05:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-23 13:05:53 -0400 |
| commit | cc9145b398b2f08a4b1a7219e0acf4176dce849f (patch) | |
| tree | b7b6cf788ecdcb9b193928e9ba538380ff59972b /MediaBrowser.Model | |
| parent | 2eee5c8a15f789557b9834f98872e0bcb33d52de (diff) | |
| parent | cffc9417c7a25263a194615096685bd8ef1e37b2 (diff) | |
Merge pull request #1873 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/MediaBrowser.Model.csproj | 1 | ||||
| -rw-r--r-- | MediaBrowser.Model/System/Architecture.cs | 9 | ||||
| -rw-r--r-- | MediaBrowser.Model/System/SystemInfo.cs | 2 |
3 files changed, 12 insertions, 0 deletions
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index 7c9f132dbd..e54273b84c 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -395,6 +395,7 @@ <Compile Include="Sync\SyncProfileOption.cs" /> <Compile Include="Sync\SyncQualityOption.cs" /> <Compile Include="Sync\SyncTarget.cs" /> + <Compile Include="System\Architecture.cs" /> <Compile Include="System\LogFile.cs" /> <Compile Include="System\PublicSystemInfo.cs" /> <Compile Include="Updates\CheckForUpdateResult.cs" /> diff --git a/MediaBrowser.Model/System/Architecture.cs b/MediaBrowser.Model/System/Architecture.cs new file mode 100644 index 0000000000..09eedddc13 --- /dev/null +++ b/MediaBrowser.Model/System/Architecture.cs @@ -0,0 +1,9 @@ +namespace MediaBrowser.Model.System +{ + public enum Architecture + { + X86 = 0, + X64 = 1, + Arm = 2 + } +} diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs index 73d5961f67..868d9dc282 100644 --- a/MediaBrowser.Model/System/SystemInfo.cs +++ b/MediaBrowser.Model/System/SystemInfo.cs @@ -154,6 +154,8 @@ namespace MediaBrowser.Model.System public bool HasExternalEncoder { get; set; } + public Architecture SystemArchitecture { get; set; } + /// <summary> /// Initializes a new instance of the <see cref="SystemInfo" /> class. /// </summary> |