diff options
| author | Tim Hobbs <jesus.tesh@gmail.com> | 2014-03-05 04:27:13 -0800 |
|---|---|---|
| committer | Tim Hobbs <jesus.tesh@gmail.com> | 2014-03-05 04:27:13 -0800 |
| commit | 482fde658746750075ff8a562ca1fb88f1739ef4 (patch) | |
| tree | 7bd5084ffa6be20a4533eb37d94f852f2d888a84 /MediaBrowser.Model | |
| parent | 604f971477da4dca5247f7d531323175ad044150 (diff) | |
| parent | 9396f16aed2f304789324afc83e0c9f385c5f00a (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Conflicts:
MediaBrowser.WebDashboard/dashboard-ui/scripts/mediaplayer.js
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/Configuration/ServerConfiguration.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dto/BaseItemDto.cs | 10 | ||||
| -rw-r--r-- | MediaBrowser.Model/Providers/RemoteSearchResult.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Model/System/SystemInfo.cs | 6 |
4 files changed, 21 insertions, 0 deletions
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index 1b4a6813e..0bff8a1bd 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -209,6 +209,9 @@ namespace MediaBrowser.Model.Configuration public bool EnableRealtimeMonitor { get; set; } public PathSubstitution[] PathSubstitutions { get; set; } + public string ServerName { get; set; } + public string WanDdns { get; set; } + /// <summary> /// Initializes a new instance of the <see cref="ServerConfiguration" /> class. /// </summary> diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs index 7ba3939a2..9e57f045a 100644 --- a/MediaBrowser.Model/Dto/BaseItemDto.cs +++ b/MediaBrowser.Model/Dto/BaseItemDto.cs @@ -48,6 +48,10 @@ namespace MediaBrowser.Model.Dto public string AwardSummary { get; set; } public float? Metascore { get; set; } + + public bool IsUnidentified { get; set; } + + public int? AnimeSeriesIndex { get; set; } /// <summary> /// Gets or sets the DVD season number. @@ -205,6 +209,12 @@ namespace MediaBrowser.Model.Dto public int? Players { get; set; } /// <summary> + /// Gets or sets a value indicating whether this instance is place holder. + /// </summary> + /// <value><c>null</c> if [is place holder] contains no value, <c>true</c> if [is place holder]; otherwise, <c>false</c>.</value> + public bool? IsPlaceHolder { get; set; } + + /// <summary> /// Gets or sets the index number. /// </summary> /// <value>The index number.</value> diff --git a/MediaBrowser.Model/Providers/RemoteSearchResult.cs b/MediaBrowser.Model/Providers/RemoteSearchResult.cs index 122266614..8c9e116d6 100644 --- a/MediaBrowser.Model/Providers/RemoteSearchResult.cs +++ b/MediaBrowser.Model/Providers/RemoteSearchResult.cs @@ -31,6 +31,8 @@ namespace MediaBrowser.Model.Providers public string SearchProviderName { get; set; } + public string GameSystem { get; set; } + public RemoteSearchResult() { ProviderIds = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase); diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs index 24707b29b..ec31c5529 100644 --- a/MediaBrowser.Model/System/SystemInfo.cs +++ b/MediaBrowser.Model/System/SystemInfo.cs @@ -147,6 +147,12 @@ namespace MediaBrowser.Model.System public bool SupportsAutoRunAtStartup { get; set; } /// <summary> + /// Gets or sets the name of the server. + /// </summary> + /// <value>The name of the server.</value> + public string ServerName { get; set; } + + /// <summary> /// Initializes a new instance of the <see cref="SystemInfo" /> class. /// </summary> public SystemInfo() |