Merge remote-tracking branch 'upstream/master'

2 files changed, 23 insertions, 0 deletions

diff --git a/MediaBrowser.Server.Implementations/Roku/RokuSessionController.cs b/MediaBrowser.Server.Implementations/Roku/RokuSessionController.cs
index 0e2f9e1b57..d806db1e0b 100644
--- a/MediaBrowser.Server.Implementations/Roku/RokuSessionController.cs
+++ b/MediaBrowser.Server.Implementations/Roku/RokuSessionController.cs
@@ -146,5 +146,16 @@ namespace MediaBrowser.Server.Implementations.Roku
                 RequestContentType = "application/json"
             });
         }
+
+
+        public Task SendGenericCommand(GenericCommand command, CancellationToken cancellationToken)
+        {
+            return SendCommand(new WebSocketMessage<GenericCommand>
+            {
+                MessageType = "Command",
+                Data = command
+
+            }, cancellationToken);
+        }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Session/WebSocketController.cs b/MediaBrowser.Server.Implementations/Session/WebSocketController.cs
index 70d7ac071f..ddf4ec2ca7 100644
--- a/MediaBrowser.Server.Implementations/Session/WebSocketController.cs
+++ b/MediaBrowser.Server.Implementations/Session/WebSocketController.cs
@@ -198,5 +198,17 @@ namespace MediaBrowser.Server.Implementations.Session
 
             }, cancellationToken);
         }
+
+        public Task SendGenericCommand(GenericCommand command, CancellationToken cancellationToken)
+        {
+            var socket = GetActiveSocket();
+
+            return socket.SendAsync(new WebSocketMessage<GenericCommand>
+            {
+                MessageType = "Command",
+                Data = command
+
+            }, cancellationToken);
+        }
     }
 }