3 files changed, 12 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/Configuration/IServerConfigurationManager.cs b/MediaBrowser.Controller/Configuration/IServerConfigurationManager.cs
index 6a2343a009..c3d1796f99 100644
--- a/MediaBrowser.Controller/Configuration/IServerConfigurationManager.cs
+++ b/MediaBrowser.Controller/Configuration/IServerConfigurationManager.cs
@@ -26,5 +26,11 @@ namespace MediaBrowser.Controller.Configuration
         /// </summary>
         /// <value>The configuration.</value>
         ServerConfiguration Configuration { get; }
+
+        /// <summary>
+        /// Sets the preferred metadata service.
+        /// </summary>
+        /// <param name="service">The service.</param>
+        void SetPreferredMetadataService(string service);
     }
 }
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index d89df5f12e..b891bcfb2a 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1526,6 +1526,11 @@ namespace MediaBrowser.Controller.Entities
 
         public virtual bool IsUnplayed(User user)
         {
+            if (user == null)
+            {
+                throw new ArgumentNullException("user");
+            }
+
             var userdata = UserDataManager.GetUserData(user.Id, GetUserDataKey());
 
             return userdata == null || !userdata.Played;
diff --git a/MediaBrowser.Controller/Session/ISessionManager.cs b/MediaBrowser.Controller/Session/ISessionManager.cs
index 4b30c964c8..88d0e9c1a1 100644
--- a/MediaBrowser.Controller/Session/ISessionManager.cs
+++ b/MediaBrowser.Controller/Session/ISessionManager.cs
@@ -281,6 +281,6 @@ namespace MediaBrowser.Controller.Session
         /// </summary>
         /// <param name="remoteEndpoint">The remote endpoint.</param>
         /// <returns><c>true</c> if the specified remote endpoint is local; otherwise, <c>false</c>.</returns>
-        bool IsLocal(string remoteEndpoint);
+        bool IsInLocalNetwork(string remoteEndpoint);
     }
 }
 \ No newline at end of file