Merge pull request #3194 from OancaAndrei/syncplay-enhanced

SyncPlay for TV series (and Music)

3 files changed, 11 insertions, 9 deletions

diff --git a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
index 28227603b..163a9c8f8 100644
--- a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
+++ b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
@@ -92,6 +92,9 @@ namespace MediaBrowser.Controller.Net
             return Task.CompletedTask;
         }
 
+        /// <inheritdoc />
+        public Task ProcessWebSocketConnectedAsync(IWebSocketConnection connection) => Task.CompletedTask;
+
         /// <summary>
         /// Starts sending messages over a web socket.
         /// </summary>
diff --git a/MediaBrowser.Controller/Net/IWebSocketListener.cs b/MediaBrowser.Controller/Net/IWebSocketListener.cs
index 7250a57b0..f1a75d518 100644
--- a/MediaBrowser.Controller/Net/IWebSocketListener.cs
+++ b/MediaBrowser.Controller/Net/IWebSocketListener.cs
@@ -3,7 +3,7 @@ using System.Threading.Tasks;
 namespace MediaBrowser.Controller.Net
 {
     /// <summary>
-    ///This is an interface for listening to messages coming through a web socket connection.
+    /// Interface for listening to messages coming through a web socket connection.
     /// </summary>
     public interface IWebSocketListener
     {
@@ -13,5 +13,12 @@ namespace MediaBrowser.Controller.Net
         /// <param name="message">The message.</param>
         /// <returns>Task.</returns>
         Task ProcessMessageAsync(WebSocketMessageInfo message);
+
+        /// <summary>
+        /// Processes a new web socket connection.
+        /// </summary>
+        /// <param name="connection">An instance of the <see cref="IWebSocketConnection"/> interface.</param>
+        /// <returns>Task.</returns>
+        Task ProcessWebSocketConnectedAsync(IWebSocketConnection connection);
     }
 }
diff --git a/MediaBrowser.Controller/Net/IWebSocketManager.cs b/MediaBrowser.Controller/Net/IWebSocketManager.cs
index ce74173e7..bb0ae83be 100644
--- a/MediaBrowser.Controller/Net/IWebSocketManager.cs
+++ b/MediaBrowser.Controller/Net/IWebSocketManager.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
-using Jellyfin.Data.Events;
 using Microsoft.AspNetCore.Http;
 
 namespace MediaBrowser.Controller.Net
@@ -12,11 +9,6 @@ namespace MediaBrowser.Controller.Net
     public interface IWebSocketManager
     {
         /// <summary>
-        /// Occurs when [web socket connected].
-        /// </summary>
-        event EventHandler<GenericEventArgs<IWebSocketConnection>> WebSocketConnected;
-
-        /// <summary>
         /// The HTTP request handler.
         /// </summary>
         /// <param name="context">The current HTTP context.</param>