aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-07-11 00:27:46 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-07-11 00:27:46 -0400
commit59de5c0d14fbf0c09926e37dce0c2e6de69000dd (patch)
tree74a654e937684f156f5c92e0c20f94c0a8d165bd /MediaBrowser.Controller
parent3cfd765cb4a875ff65acf74826533ba1a804b34a (diff)
update translations
Diffstat (limited to 'MediaBrowser.Controller')
-rw-r--r--MediaBrowser.Controller/Configuration/IServerConfigurationManager.cs6
-rw-r--r--MediaBrowser.Controller/Entities/BaseItem.cs5
-rw-r--r--MediaBrowser.Controller/Session/ISessionManager.cs2
3 files changed, 12 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/Configuration/IServerConfigurationManager.cs b/MediaBrowser.Controller/Configuration/IServerConfigurationManager.cs
index 6a2343a00..c3d1796f9 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 d89df5f12..b891bcfb2 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 4b30c964c..88d0e9c1a 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