From fbb1bb319c87303c9604ee6cb35af01abd895552 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 7 Feb 2017 13:33:15 -0500
Subject: [PATCH] update wdtv live dlna profile

---
 Emby.Dlna/Profiles/WdtvLiveProfile.cs                     | 3 +--
 Emby.Dlna/Profiles/Xml/WDTV Live.xml                      | 2 +-
 Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs       | 7 -------
 Emby.Server.Implementations/LiveTv/LiveTvManager.cs       | 1 -
 .../LiveTv/LiveTvMediaSourceProvider.cs                   | 1 +
 MediaBrowser.Model/Entities/MetadataProviders.cs          | 4 ----
 MediaBrowser.Providers/Music/AudioDbAlbumProvider.cs      | 2 +-
 MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs          | 8 --------
 8 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/Emby.Dlna/Profiles/WdtvLiveProfile.cs b/Emby.Dlna/Profiles/WdtvLiveProfile.cs
index 6cef2d965..756882592 100644
--- a/Emby.Dlna/Profiles/WdtvLiveProfile.cs
+++ b/Emby.Dlna/Profiles/WdtvLiveProfile.cs
@@ -125,8 +125,7 @@ namespace Emby.Dlna.Profiles
 
                 new DirectPlayProfile
                 {
-                    Container = "flac",
-                    AudioCodec = "flac",
+                    Container = "flac,ac3",
                     Type = DlnaProfileType.Audio
                 },
 
diff --git a/Emby.Dlna/Profiles/Xml/WDTV Live.xml b/Emby.Dlna/Profiles/Xml/WDTV Live.xml
index 1cf3ef597..775d25302 100644
--- a/Emby.Dlna/Profiles/Xml/WDTV Live.xml	
+++ b/Emby.Dlna/Profiles/Xml/WDTV Live.xml	
@@ -45,7 +45,7 @@
     <DirectPlayProfile container="asf" audioCodec="mp2,ac3" videoCodec="mpeg2video" type="Video" />
     <DirectPlayProfile container="mp3" audioCodec="mp2,mp3" type="Audio" />
     <DirectPlayProfile container="mp4" audioCodec="mp4" type="Audio" />
-    <DirectPlayProfile container="flac" audioCodec="flac" type="Audio" />
+    <DirectPlayProfile container="flac,ac3" type="Audio" />
     <DirectPlayProfile container="asf" audioCodec="wmav2,wmapro,wmavoice" type="Audio" />
     <DirectPlayProfile container="ogg" audioCodec="vorbis" type="Audio" />
     <DirectPlayProfile container="jpeg,png,gif,bmp,tiff" type="Photo" />
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index 89ef87c8e..1ec5dd1d5 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -2092,13 +2092,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                         writer.WriteElementString("credits", person);
                     }
 
-                    var rt = item.GetProviderId(MetadataProviders.RottenTomatoes);
-
-                    if (!string.IsNullOrEmpty(rt))
-                    {
-                        writer.WriteElementString("rottentomatoesid", rt);
-                    }
-
                     var tmdbCollection = item.GetProviderId(MetadataProviders.TmdbCollection);
 
                     if (!string.IsNullOrEmpty(tmdbCollection))
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
index e59a8f93c..613a30b1d 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -365,7 +365,6 @@ namespace Emby.Server.Implementations.LiveTv
                 }
             }
 
-            _logger.Info("Live stream info: {0}", _jsonSerializer.SerializeToString(info));
             Normalize(info, service, isVideo);
 
             return new Tuple<MediaSourceInfo, IDirectStreamProvider>(info, directStreamProvider);
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs b/Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
index dd95660c7..747e0fdd3 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
@@ -154,6 +154,7 @@ namespace Emby.Server.Implementations.LiveTv
                 _logger.ErrorException("Error probing live tv stream", ex);
             }
 
+            _logger.Info("Live stream info: {0}", _jsonSerializer.SerializeToString(stream));
             return new Tuple<MediaSourceInfo, IDirectStreamProvider>(stream, directStreamProvider);
         }
 
diff --git a/MediaBrowser.Model/Entities/MetadataProviders.cs b/MediaBrowser.Model/Entities/MetadataProviders.cs
index 1e7bde934..efd4339d5 100644
--- a/MediaBrowser.Model/Entities/MetadataProviders.cs
+++ b/MediaBrowser.Model/Entities/MetadataProviders.cs
@@ -24,10 +24,6 @@ namespace MediaBrowser.Model.Entities
         /// </summary>
         Tvcom = 5,
         /// <summary>
-        /// The rotten tomatoes
-        /// </summary>
-        RottenTomatoes = 6,
-        /// <summary>
         /// Tmdb Collection Id
         /// </summary>
         TmdbCollection = 7,
diff --git a/MediaBrowser.Providers/Music/AudioDbAlbumProvider.cs b/MediaBrowser.Providers/Music/AudioDbAlbumProvider.cs
index 3f969b609..96eab63cd 100644
--- a/MediaBrowser.Providers/Music/AudioDbAlbumProvider.cs
+++ b/MediaBrowser.Providers/Music/AudioDbAlbumProvider.cs
@@ -142,7 +142,7 @@ namespace MediaBrowser.Providers.Music
 
             if (fileInfo.Exists)
             {
-                if ((DateTime.UtcNow - _fileSystem.GetLastWriteTimeUtc(fileInfo)).TotalDays <= 7)
+                if ((DateTime.UtcNow - _fileSystem.GetLastWriteTimeUtc(fileInfo)).TotalDays <= 3)
                 {
                     return _cachedTask;
                 }
diff --git a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
index 4f7715874..5a1c7bf13 100644
--- a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
@@ -579,14 +579,6 @@ namespace MediaBrowser.XbmcMetadata.Savers
                 writer.WriteElementString("website", item.HomePageUrl);
             }
 
-            var rt = item.GetProviderId(MetadataProviders.RottenTomatoes);
-
-            if (!string.IsNullOrEmpty(rt))
-            {
-                writer.WriteElementString("rottentomatoesid", rt);
-                writtenProviderIds.Add(MetadataProviders.RottenTomatoes.ToString());
-            }
-
             var tmdbCollection = item.GetProviderId(MetadataProviders.TmdbCollection);
 
             if (!string.IsNullOrEmpty(tmdbCollection))