From d683f3061979d786efc574f1073af4e77da11772 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 13 Mar 2016 21:34:24 -0400
Subject: update music user data key

---
 MediaBrowser.Model/Configuration/ServerConfiguration.cs | 3 ++-
 MediaBrowser.Model/Dto/BaseItemDto.cs                   | 6 ------
 MediaBrowser.Model/Querying/ItemFields.cs               | 5 -----
 3 files changed, 2 insertions(+), 12 deletions(-)

(limited to 'MediaBrowser.Model')

diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 64edbdea9..009068dea 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -207,7 +207,8 @@ namespace MediaBrowser.Model.Configuration
         public bool DownloadImagesInAdvance { get; set; }
 
         public bool EnableAnonymousUsageReporting { get; set; }
-        
+        public bool EnableStandaloneMusicKeys { 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 ef2de5d78..8e3284152 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -206,12 +206,6 @@ namespace MediaBrowser.Model.Dto
         /// <value>The short overview.</value>
         public string ShortOverview { get; set; }
 
-        /// <summary>
-        /// Gets or sets the name of the TMDB collection.
-        /// </summary>
-        /// <value>The name of the TMDB collection.</value>
-        public string TmdbCollectionName { get; set; }
-
         /// <summary>
         /// Gets or sets the taglines.
         /// </summary>
diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs
index 97fec8fdd..1540f178a 100644
--- a/MediaBrowser.Model/Querying/ItemFields.cs
+++ b/MediaBrowser.Model/Querying/ItemFields.cs
@@ -235,11 +235,6 @@
         /// </summary>
         VoteCount,
 
-        /// <summary>
-        /// The TMDB collection name
-        /// </summary>
-        TmdbCollectionName,
-        
         /// <summary>
         /// The trailer url of the item
         /// </summary>
-- 
cgit v1.2.3


From 3bae86ae4174cc7f4c0968c5d4a18f38520e605e Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 13 Mar 2016 23:32:03 -0400
Subject: update sat page

---
 MediaBrowser.Model/LiveTv/LiveTvOptions.cs                       | 1 +
 .../LiveTv/TunerHosts/SatIp/SatIpDiscovery.cs                    | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'MediaBrowser.Model')

diff --git a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
index 78c683064..f92a0c6e2 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
@@ -35,6 +35,7 @@ namespace MediaBrowser.Model.LiveTv
         public string M3UUrl { get; set; }
         public string FriendlyName { get; set; }
         public int Tuners { get; set; }
+        public string DiseqC { get; set; }
 
         public int DataVersion { get; set; }
 
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/SatIpDiscovery.cs b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/SatIpDiscovery.cs
index 9a02413cd..19b91a34f 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/SatIpDiscovery.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/SatIpDiscovery.cs
@@ -90,6 +90,11 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.SatIp
 
                 if (existing == null)
                 {
+                    if (string.IsNullOrWhiteSpace(info.M3UUrl))
+                    {
+                        return;
+                    }
+
                     await _liveTvManager.SaveTunerHost(new TunerHostInfo
                     {
                         Type = SatIpHost.DeviceType,
@@ -97,7 +102,9 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.SatIp
                         DataVersion = 1,
                         DeviceId = info.DeviceId,
                         FriendlyName = info.FriendlyName,
-                        Tuners = info.Tuners
+                        Tuners = info.Tuners,
+                        M3UUrl = info.M3UUrl,
+                        IsEnabled = true
 
                     }).ConfigureAwait(false);
                 }
-- 
cgit v1.2.3