Merge branch 'master' into trickplay

1 files changed, 2 insertions, 7 deletions

diff --git a/Emby.Server.Implementations/Session/SessionWebSocketListener.cs b/Emby.Server.Implementations/Session/SessionWebSocketListener.cs
index 4e427b1a4..b3c93a904 100644
--- a/Emby.Server.Implementations/Session/SessionWebSocketListener.cs
+++ b/Emby.Server.Implementations/Session/SessionWebSocketListener.cs
@@ -6,9 +6,8 @@ using System.Threading;
 using System.Threading.Tasks;
 using Jellyfin.Api.Extensions;
 using MediaBrowser.Controller.Net;
+using MediaBrowser.Controller.Net.WebSocketMessages.Outbound;
 using MediaBrowser.Controller.Session;
-using MediaBrowser.Model.Net;
-using MediaBrowser.Model.Session;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 
@@ -308,11 +307,7 @@ namespace Emby.Server.Implementations.Session
         private Task SendForceKeepAlive(IWebSocketConnection webSocket)
         {
             return webSocket.SendAsync(
-                new WebSocketMessage<int>
-                {
-                    MessageType = SessionMessageType.ForceKeepAlive,
-                    Data = WebSocketLostTimeout
-                },
+                new ForceKeepAliveMessage(WebSocketLostTimeout),
                 CancellationToken.None);
         }