diff options
| author | Tim Hobbs <jesus.tesh@gmail.com> | 2014-03-31 14:39:27 -0700 |
|---|---|---|
| committer | Tim Hobbs <jesus.tesh@gmail.com> | 2014-03-31 14:39:27 -0700 |
| commit | f4f76a1a5bcdef2ea3eb77101d70959bd70cb8e7 (patch) | |
| tree | 25da19e597d1e36fb768293385a3a212f37e8ef0 /MediaBrowser.Controller | |
| parent | 5693327a20c3f92f33da63cc3f0cb659d6cd8576 (diff) | |
| parent | 32ac5619fe3678b8482d8771941ad601e1a59afd (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Session/ISessionController.cs | 10 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Session/ISessionManager.cs | 8 |
2 files changed, 5 insertions, 13 deletions
diff --git a/MediaBrowser.Controller/Session/ISessionController.cs b/MediaBrowser.Controller/Session/ISessionController.cs index 02cc875bd..cf57f6621 100644 --- a/MediaBrowser.Controller/Session/ISessionController.cs +++ b/MediaBrowser.Controller/Session/ISessionController.cs @@ -20,14 +20,6 @@ namespace MediaBrowser.Controller.Session bool IsSessionActive { get; } /// <summary> - /// Sends the system command. - /// </summary> - /// <param name="command">The command.</param> - /// <param name="cancellationToken">The cancellation token.</param> - /// <returns>Task.</returns> - Task SendSystemCommand(SystemCommand command, CancellationToken cancellationToken); - - /// <summary> /// Sends the message command. /// </summary> /// <param name="command">The command.</param> @@ -65,7 +57,7 @@ namespace MediaBrowser.Controller.Session /// <param name="command">The command.</param> /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task.</returns> - Task SendGenericCommand(GenericCommand command, CancellationToken cancellationToken); + Task SendGeneralCommand(GeneralCommand command, CancellationToken cancellationToken); /// <summary> /// Sends the library update info. diff --git a/MediaBrowser.Controller/Session/ISessionManager.cs b/MediaBrowser.Controller/Session/ISessionManager.cs index 459e43d08..434c51336 100644 --- a/MediaBrowser.Controller/Session/ISessionManager.cs +++ b/MediaBrowser.Controller/Session/ISessionManager.cs @@ -84,15 +84,15 @@ namespace MediaBrowser.Controller.Session Task ReportSessionEnded(Guid sessionId); /// <summary> - /// Sends the system command. + /// Sends the general command. /// </summary> /// <param name="controllingSessionId">The controlling session identifier.</param> - /// <param name="sessionId">The session id.</param> + /// <param name="sessionId">The session identifier.</param> /// <param name="command">The command.</param> /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task.</returns> - Task SendSystemCommand(Guid controllingSessionId, Guid sessionId, SystemCommand command, CancellationToken cancellationToken); - + Task SendGeneralCommand(Guid controllingSessionId, Guid sessionId, GeneralCommand command, CancellationToken cancellationToken); + /// <summary> /// Sends the message command. /// </summary> |