aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-07-26 17:02:23 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-07-26 17:02:23 -0400
commit1bf9c446d93f5b9aae9a8f24439690beb0be3295 (patch)
tree2388cd834286fe702c2162d72d8686ef86c591d8 /MediaBrowser.Model
parentc08f8fd6fe68829141fa215678f8111c8f018f05 (diff)
update hdhomerun
Diffstat (limited to 'MediaBrowser.Model')
-rw-r--r--MediaBrowser.Model/Configuration/ServerConfiguration.cs138
-rw-r--r--MediaBrowser.Model/Session/GeneralCommandType.cs3
-rw-r--r--MediaBrowser.Model/Users/UserPolicy.cs4
3 files changed, 140 insertions, 5 deletions
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 19403a55e7..0a2fabc1b0 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -283,7 +283,59 @@ namespace MediaBrowser.Model.Configuration
{
new ImageOption
{
- Limit = 2,
+ Limit = 1,
+ MinWidth = 1280,
+ Type = ImageType.Backdrop
+ },
+
+ // Don't download this by default as it's rarely used.
+ new ImageOption
+ {
+ Limit = 0,
+ Type = ImageType.Art
+ },
+
+ // Don't download this by default as it's rarely used.
+ new ImageOption
+ {
+ Limit = 0,
+ Type = ImageType.Disc
+ },
+
+ new ImageOption
+ {
+ Limit = 1,
+ Type = ImageType.Primary
+ },
+
+ new ImageOption
+ {
+ Limit = 0,
+ Type = ImageType.Banner
+ },
+
+ new ImageOption
+ {
+ Limit = 1,
+ Type = ImageType.Thumb
+ },
+
+ new ImageOption
+ {
+ Limit = 1,
+ Type = ImageType.Logo
+ }
+ }
+ },
+
+ new MetadataOptions(1, 1280)
+ {
+ ItemType = "MusicVideo",
+ ImageOptions = new []
+ {
+ new ImageOption
+ {
+ Limit = 1,
MinWidth = 1280,
Type = ImageType.Backdrop
},
@@ -335,7 +387,7 @@ namespace MediaBrowser.Model.Configuration
{
new ImageOption
{
- Limit = 2,
+ Limit = 1,
MinWidth = 1280,
Type = ImageType.Backdrop
},
@@ -432,9 +484,89 @@ namespace MediaBrowser.Model.Configuration
}
},
+ new MetadataOptions(1, 1280)
+ {
+ ItemType = "BoxSet",
+ ImageOptions = new []
+ {
+ new ImageOption
+ {
+ Limit = 1,
+ MinWidth = 1280,
+ Type = ImageType.Backdrop
+ },
+
+ new ImageOption
+ {
+ Limit = 1,
+ Type = ImageType.Primary
+ },
+
+ new ImageOption
+ {
+ Limit = 1,
+ Type = ImageType.Thumb
+ },
+
+ new ImageOption
+ {
+ Limit = 1,
+ Type = ImageType.Logo
+ },
+
+ // Don't download this by default as it's rarely used.
+ new ImageOption
+ {
+ Limit = 0,
+ Type = ImageType.Art
+ },
+
+ // Don't download this by default as it's rarely used.
+ new ImageOption
+ {
+ Limit = 0,
+ Type = ImageType.Disc
+ },
+
+ // Don't download this by default as it's rarely used.
+ new ImageOption
+ {
+ Limit = 0,
+ Type = ImageType.Banner
+ }
+ }
+ },
+
new MetadataOptions(0, 1280)
{
- ItemType = "Season"
+ ItemType = "Season",
+ ImageOptions = new []
+ {
+ new ImageOption
+ {
+ Limit = 0,
+ MinWidth = 1280,
+ Type = ImageType.Backdrop
+ },
+
+ new ImageOption
+ {
+ Limit = 1,
+ Type = ImageType.Primary
+ },
+
+ new ImageOption
+ {
+ Limit = 0,
+ Type = ImageType.Banner
+ },
+
+ new ImageOption
+ {
+ Limit = 0,
+ Type = ImageType.Thumb
+ }
+ }
}
};
}
diff --git a/MediaBrowser.Model/Session/GeneralCommandType.cs b/MediaBrowser.Model/Session/GeneralCommandType.cs
index dcb3b20ca1..79220f0662 100644
--- a/MediaBrowser.Model/Session/GeneralCommandType.cs
+++ b/MediaBrowser.Model/Session/GeneralCommandType.cs
@@ -34,7 +34,6 @@
DisplayContent = 26,
GoToSearch = 27,
DisplayMessage = 28,
- SetRepeatAll = 29,
- SetRepeatOne = 30
+ SetRepeatMode = 29
}
} \ No newline at end of file
diff --git a/MediaBrowser.Model/Users/UserPolicy.cs b/MediaBrowser.Model/Users/UserPolicy.cs
index b3040d6f8c..16b4b673d9 100644
--- a/MediaBrowser.Model/Users/UserPolicy.cs
+++ b/MediaBrowser.Model/Users/UserPolicy.cs
@@ -80,6 +80,10 @@ namespace MediaBrowser.Model.Users
EnableLiveTvManagement = true;
EnableLiveTvAccess = true;
+ // Without this on by default, admins won't be able to do this
+ // Improve in the future
+ EnableLiveTvManagement = true;
+
EnableSharedDeviceControl = true;
BlockedTags = new string[] { };