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.Server.Implementations/Dto/DtoService.cs         | 10 ----------
 MediaBrowser.Server.Implementations/Library/LibraryManager.cs |  5 -----
 2 files changed, 15 deletions(-)

(limited to 'MediaBrowser.Server.Implementations')

diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
index a19a122c3..fb202b798 100644
--- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs
+++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
@@ -1378,16 +1378,6 @@ namespace MediaBrowser.Server.Implementations.Dto
                 }
             }
 
-            // Add MovieInfo
-            var movie = item as Movie;
-            if (movie != null)
-            {
-                if (fields.Contains(ItemFields.TmdbCollectionName))
-                {
-                    dto.TmdbCollectionName = movie.TmdbCollectionName;
-                }
-            }
-
             var hasSpecialFeatures = item as IHasSpecialFeatures;
             if (hasSpecialFeatures != null)
             {
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 721603efe..3c56af9e6 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -1044,11 +1044,6 @@ namespace MediaBrowser.Server.Implementations.Library
             return names;
         }
 
-        private void SetPropertiesFromSongs(MusicArtist artist, IEnumerable<IHasMetadata> items)
-        {
-
-        }
-
         /// <summary>
         /// Validate and refresh the People sub-set of the IBN.
         /// The items are stored in the db but not loaded into memory until actually requested by an operation.
-- 
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.Server.Implementations')

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