From b28be7e98612d7d0bac045fce52a2f3414fb7238 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 19 Nov 2015 00:19:54 -0500
Subject: update cinema mode on/off setting

---
 MediaBrowser.Model/ApiClient/ServerCredentials.cs | 5 +++++
 MediaBrowser.Model/ApiClient/ServerInfo.cs        | 1 +
 2 files changed, 6 insertions(+)

(limited to 'MediaBrowser.Model/ApiClient')

diff --git a/MediaBrowser.Model/ApiClient/ServerCredentials.cs b/MediaBrowser.Model/ApiClient/ServerCredentials.cs
index b5a1a7b49..f9af0fa4e 100644
--- a/MediaBrowser.Model/ApiClient/ServerCredentials.cs
+++ b/MediaBrowser.Model/ApiClient/ServerCredentials.cs
@@ -42,6 +42,11 @@ namespace MediaBrowser.Model.ApiClient
                     existing.DateLastAccessed = server.DateLastAccessed;
                 }
 
+                if (server.DateLastLocalConnection > existing.DateLastLocalConnection)
+                {
+                    existing.DateLastLocalConnection = server.DateLastLocalConnection;
+                }
+                
                 existing.UserLinkType = server.UserLinkType;
 
                 if (!string.IsNullOrEmpty(server.AccessToken))
diff --git a/MediaBrowser.Model/ApiClient/ServerInfo.cs b/MediaBrowser.Model/ApiClient/ServerInfo.cs
index e1fa581d7..53ae5be52 100644
--- a/MediaBrowser.Model/ApiClient/ServerInfo.cs
+++ b/MediaBrowser.Model/ApiClient/ServerInfo.cs
@@ -19,6 +19,7 @@ namespace MediaBrowser.Model.ApiClient
         public String AccessToken { get; set; }
         public List<WakeOnLanInfo> WakeOnLanInfos { get; set; }
         public DateTime DateLastAccessed { get; set; }
+        public DateTime DateLastLocalConnection { get; set; }
         public String ExchangeToken { get; set; }
         public UserLinkType? UserLinkType { get; set; }
         public ConnectionMode? LastConnectionMode { get; set; }
-- 
cgit v1.2.3


From 84caa1084b05033062528053ea5266bda93dee12 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 24 Jan 2016 14:39:24 -0500
Subject: update nuget

---
 MediaBrowser.Model/ApiClient/IApiClient.cs | 9 ++++++++-
 Nuget/MediaBrowser.Common.Internal.nuspec  | 4 ++--
 Nuget/MediaBrowser.Common.nuspec           | 2 +-
 Nuget/MediaBrowser.Model.Signed.nuspec     | 2 +-
 Nuget/MediaBrowser.Server.Core.nuspec      | 4 ++--
 5 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'MediaBrowser.Model/ApiClient')

diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs
index 6107c0fbe..904beb736 100644
--- a/MediaBrowser.Model/ApiClient/IApiClient.cs
+++ b/MediaBrowser.Model/ApiClient/IApiClient.cs
@@ -1413,6 +1413,13 @@ namespace MediaBrowser.Model.ApiClient
         /// </summary>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task&lt;System.Int32&gt;.</returns>
-        Task<int> GetSupportedBitrate(CancellationToken cancellationToken);
+        Task<int> DetectMaxBitrate(CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Gets the end point information.
+        /// </summary>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>System.Threading.Tasks.Task&lt;MediaBrowser.Model.Net.EndPointInfo&gt;.</returns>
+        Task<EndPointInfo> GetEndPointInfo(CancellationToken cancellationToken);
     }
 }
\ No newline at end of file
diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec
index bec233b7d..c4f2bd130 100644
--- a/Nuget/MediaBrowser.Common.Internal.nuspec
+++ b/Nuget/MediaBrowser.Common.Internal.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common.Internal</id>
-        <version>3.0.640</version>
+        <version>3.0.641</version>
         <title>MediaBrowser.Common.Internal</title>
         <authors>Luke</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,7 +12,7 @@
         <description>Contains common components shared by Emby Theater and Emby Server. Not intended for plugin developer consumption.</description>
         <copyright>Copyright © Emby 2013</copyright>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.640" />
+            <dependency id="MediaBrowser.Common" version="3.0.641" />
             <dependency id="NLog" version="4.2.3" />
             <dependency id="SimpleInjector" version="3.1.2" />
         </dependencies>
diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec
index 76cf77090..984e03342 100644
--- a/Nuget/MediaBrowser.Common.nuspec
+++ b/Nuget/MediaBrowser.Common.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common</id>
-        <version>3.0.640</version>
+        <version>3.0.641</version>
         <title>MediaBrowser.Common</title>
         <authors>Emby Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
diff --git a/Nuget/MediaBrowser.Model.Signed.nuspec b/Nuget/MediaBrowser.Model.Signed.nuspec
index 4b207f1aa..2b0826670 100644
--- a/Nuget/MediaBrowser.Model.Signed.nuspec
+++ b/Nuget/MediaBrowser.Model.Signed.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Model.Signed</id>
-        <version>3.0.640</version>
+        <version>3.0.641</version>
         <title>MediaBrowser.Model - Signed Edition</title>
         <authors>Emby Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec
index 717019bfe..80d3bc103 100644
--- a/Nuget/MediaBrowser.Server.Core.nuspec
+++ b/Nuget/MediaBrowser.Server.Core.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Server.Core</id>
-        <version>3.0.640</version>
+        <version>3.0.641</version>
         <title>Media Browser.Server.Core</title>
         <authors>Emby Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,7 +12,7 @@
         <description>Contains core components required to build plugins for Emby Server.</description>
         <copyright>Copyright © Emby 2013</copyright>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.640" />
+            <dependency id="MediaBrowser.Common" version="3.0.641" />
 			<dependency id="Interfaces.IO" version="1.0.0.5" />
         </dependencies>
     </metadata>
-- 
cgit v1.2.3