aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model/Configuration
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Model/Configuration')
-rw-r--r--MediaBrowser.Model/Configuration/ServerConfiguration.cs19
-rw-r--r--MediaBrowser.Model/Configuration/UserConfiguration.cs10
2 files changed, 13 insertions, 16 deletions
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 230680ff25..5b22083334 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -86,12 +86,6 @@ namespace MediaBrowser.Model.Configuration
public string[] SortRemoveWords { get; set; }
/// <summary>
- /// Show an output log window for debugging
- /// </summary>
- /// <value><c>true</c> if [show log window]; otherwise, <c>false</c>.</value>
- public bool ShowLogWindow { get; set; }
-
- /// <summary>
/// Gets or sets the minimum percentage of an item that must be played in order for playstate to be updated.
/// </summary>
/// <value>The min resume PCT.</value>
@@ -176,7 +170,7 @@ namespace MediaBrowser.Model.Configuration
public PeopleMetadataOptions PeopleMetadataOptions { get; set; }
public bool FindInternetTrailers { get; set; }
- public string[] InsecureApps2 { get; set; }
+ public string[] InsecureApps6 { get; set; }
public bool SaveMetadataHidden { get; set; }
@@ -228,12 +222,19 @@ namespace MediaBrowser.Model.Configuration
PeopleMetadataOptions = new PeopleMetadataOptions();
- InsecureApps2 = new[]
+ InsecureApps6 = new[]
{
"Roku",
"Chromecast",
"iOS",
- "Windows Phone"
+ "Windows Phone",
+ "Windows RT",
+ "Xbmc",
+ "Unknown app",
+ "MediaPortal",
+ "Media Portal",
+ "iPad",
+ "iPhone"
};
MetadataOptions = new[]
diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index ab0cb83c8f..51802a0fc6 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -37,12 +37,6 @@ namespace MediaBrowser.Model.Configuration
public string SubtitleLanguagePreference { get; set; }
/// <summary>
- /// Gets or sets a value indicating whether [use forced subtitles only].
- /// </summary>
- /// <value><c>true</c> if [use forced subtitles only]; otherwise, <c>false</c>.</value>
- public bool UseForcedSubtitlesOnly { get; set; }
-
- /// <summary>
/// Gets or sets a value indicating whether this instance is hidden.
/// </summary>
/// <value><c>true</c> if this instance is hidden; otherwise, <c>false</c>.</value>
@@ -89,6 +83,8 @@ namespace MediaBrowser.Model.Configuration
public AccessSchedule[] AccessSchedules { get; set; }
public bool EnableUserPreferenceAccess { get; set; }
+
+ public string[] LatestItemsExcludes { get; set; }
/// <summary>
/// Initializes a new instance of the <see cref="UserConfiguration" /> class.
@@ -100,6 +96,7 @@ namespace MediaBrowser.Model.Configuration
EnableMediaPlayback = true;
EnableLiveTvAccess = true;
+ LatestItemsExcludes = new string[] { };
OrderedViews = new string[] { };
BlockedMediaFolders = new string[] { };
DisplayChannelsWithinViews = new string[] { };
@@ -108,7 +105,6 @@ namespace MediaBrowser.Model.Configuration
ExcludeFoldersFromGrouping = new string[] { };
DisplayCollectionsView = true;
- DisplayFoldersView = true;
SyncConnectName = true;
SyncConnectImage = true;