3 files changed, 20 insertions, 3 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index ee0bf354f..ed5dde4c5 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -16,6 +16,7 @@ using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Querying;
 using MediaBrowser.Naming.Audio;
 using MediaBrowser.Naming.Common;
 using MediaBrowser.Naming.TV;
@@ -1209,6 +1210,18 @@ namespace MediaBrowser.Server.Implementations.Library
             return item;
         }
 
+        public QueryResult<BaseItem> GetItems(InternalItemsQuery query)
+        {
+            var result = ItemRepository.GetItemIdsList(query);
+
+            var items = result.Select(GetItemById).ToArray();
+
+            return new QueryResult<BaseItem>
+            {
+                Items = items
+            };
+        }
+
         /// <summary>
         /// Gets the intros.
         /// </summary>
diff --git a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
index 71fd4127b..b6441053d 100644
--- a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
@@ -474,7 +474,7 @@ namespace MediaBrowser.Server.Implementations.Library
         }
 
         private Timer _closeTimer;
-        private readonly TimeSpan _openStreamMaxAge = TimeSpan.FromSeconds(40);
+        private readonly TimeSpan _openStreamMaxAge = TimeSpan.FromSeconds(60);
 
         private void StartCloseTimer()
         {
diff --git a/MediaBrowser.Server.Implementations/Library/UserDataManager.cs b/MediaBrowser.Server.Implementations/Library/UserDataManager.cs
index 8cbb2eb1a..ae737d244 100644
--- a/MediaBrowser.Server.Implementations/Library/UserDataManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserDataManager.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using MediaBrowser.Common.Events;
+using MediaBrowser.Common.Events;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
@@ -10,6 +9,7 @@ using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
 using System;
 using System.Collections.Concurrent;
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -262,5 +262,9 @@ namespace MediaBrowser.Server.Implementations.Library
             return playedToCompletion;
         }
 
+        public UserItemData GetUserData(string userId, string key)
+        {
+            return GetUserData(new Guid(userId), key);
+        }
     }
 }