Merge pull request #2220 from MediaBrowser/dev

update live stream sharing

4 files changed, 42 insertions, 25 deletions

diff --git a/MediaBrowser.Server.Implementations/Library/UserDataManager.cs b/MediaBrowser.Server.Implementations/Library/UserDataManager.cs
index 139ea0ab6..9ee65a57c 100644
--- a/MediaBrowser.Server.Implementations/Library/UserDataManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserDataManager.cs
@@ -274,6 +274,10 @@ namespace MediaBrowser.Server.Implementations.Library
                 positionTicks = 0;
                 data.Played = false;
             }
+            if (item is Audio)
+            {
+                positionTicks = 0;
+            }
 
             data.PlaybackPositionTicks = positionTicks;
 
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
index 365f784a7..c4922eec5 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
@@ -512,29 +512,14 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
             if (EnableLocalBuffer())
             {
                 var liveStream = new HdHomerunLiveStream(mediaSource, streamId, _fileSystem, _httpClient, Logger, Config.ApplicationPaths, _appHost);
-                if (info.AllowHWTranscoding)
-                {
-                    var model = await GetModelInfo(info, cancellationToken).ConfigureAwait(false);
-
-                    if ((model ?? string.Empty).IndexOf("hdtc", StringComparison.OrdinalIgnoreCase) != -1)
-                    {
-                        liveStream.EnableStreamSharing = !info.AllowHWTranscoding;
-                    }
-                    else
-                    {
-                        liveStream.EnableStreamSharing = true;
-                    }
-                }
-                else
-                {
-                    liveStream.EnableStreamSharing = true;
-                }
+                liveStream.EnableStreamSharing = true;
                 return liveStream;
             }
             else
             {
                 var liveStream = new LiveStream(mediaSource);
-                liveStream.EnableStreamSharing = false;
+                liveStream.EnableStreamSharing = true;
+                //liveStream.EnableStreamSharing = false;
                 return liveStream;
             }
         }
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
index 1656d8304..2235bfe0d 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
@@ -1875,17 +1875,23 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 index++;
             }
 
-            if (!reader.IsDBNull(index))
+            if (query.HasField(ItemFields.ThemeSongIds))
             {
-                item.ThemeSongIds = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).Select(i => new Guid(i)).ToList();
+                if (!reader.IsDBNull(index))
+                {
+                    item.ThemeSongIds = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).Select(i => new Guid(i)).ToList();
+                }
+                index++;
             }
-            index++;
 
-            if (!reader.IsDBNull(index))
+            if (query.HasField(ItemFields.ThemeVideoIds))
             {
-                item.ThemeVideoIds = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).Select(i => new Guid(i)).ToList();
+                if (!reader.IsDBNull(index))
+                {
+                    item.ThemeVideoIds = reader.GetString(index).Split('|').Where(i => !string.IsNullOrWhiteSpace(i)).Select(i => new Guid(i)).ToList();
+                }
+                index++;
             }
-            index++;
 
             if (string.IsNullOrWhiteSpace(item.Tagline))
             {
@@ -3826,6 +3832,28 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 clause += ")";
                 whereClauses.Add(clause);
             }
+            if (query.HasThemeSong.HasValue)
+            {
+                if (query.HasThemeSong.Value)
+                {
+                    whereClauses.Add("ThemeSongIds not null");
+                }
+                else
+                {
+                    whereClauses.Add("ThemeSongIds is null");
+                }
+            }
+            if (query.HasThemeVideo.HasValue)
+            {
+                if (query.HasThemeVideo.Value)
+                {
+                    whereClauses.Add("ThemeVideoIds not null");
+                }
+                else
+                {
+                    whereClauses.Add("ThemeVideoIds is null");
+                }
+            }
 
             //var enableItemsByName = query.IncludeItemsByName ?? query.IncludeItemTypes.Length > 0;
             var enableItemsByName = query.IncludeItemsByName ?? false;
diff --git a/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs b/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
index 07b63718c..d9c36cd3b 100644
--- a/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
+++ b/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
@@ -17,7 +17,7 @@ namespace MediaBrowser.Server.Implementations.Playlists
 
         public override bool IsVisible(User user)
         {
-            return base.IsVisible(user);
+            return base.IsVisible(user) && GetChildren(user, true).Any();
         }
 
         protected override IEnumerable<BaseItem> GetEligibleChildrenForRecursiveChildren(User user)