lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev

Browse Source
This commit is contained in:
Luke Pulverenti 2015-03-14 13:03:00 -04:00
commit 075952107b
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MediaBrowser.Model/ApiClient/IApiClient.cs
View File

@ -1318,7 +1318,7 @@ namespace MediaBrowser.Model.ApiClient
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task.</returns>
Task SendContextMessageAsync(string itemType, string itemId, string itemName, string context,
CancellationToken cancellationToken);
CancellationToken cancellationToken = default(CancellationToken));
/// <summary>
/// Gets the content upload history.
@ -1336,7 +1336,7 @@ namespace MediaBrowser.Model.ApiClient
/// <returns>Task.</returns>
Task UploadFile(Stream stream,
LocalFileInfo file,
CancellationToken cancellationToken);
CancellationToken cancellationToken = default(CancellationToken));
/// <summary>
/// Gets the devices options options.
@ -1392,7 +1392,7 @@ namespace MediaBrowser.Model.ApiClient
/// <param name="id">The identifier.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task&lt;Stream&gt;.</returns>
Task<Stream> GetSyncJobItemFile(string id, CancellationToken cancellationToken);
Task<Stream> GetSyncJobItemFile(string id, CancellationToken cancellationToken = default(CancellationToken));
/// <summary>
/// Gets the synchronize job item additional file.

12
MediaBrowser.Model/ApiClient/IConnectionManager.cs
View File

@ -66,7 +66,7 @@ namespace MediaBrowser.Model.ApiClient
/// </summary>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task&lt;ConnectionResult&gt;.</returns>
Task<ConnectionResult> Connect(CancellationToken cancellationToken);
Task<ConnectionResult> Connect(CancellationToken cancellationToken = default(CancellationToken));
/// <summary>
/// Connects the specified API client.
@ -74,7 +74,7 @@ namespace MediaBrowser.Model.ApiClient
/// <param name="apiClient">The API client.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task&lt;ConnectionResult&gt;.</returns>
Task<ConnectionResult> Connect(IApiClient apiClient, CancellationToken cancellationToken);
Task<ConnectionResult> Connect(IApiClient apiClient, CancellationToken cancellationToken = default(CancellationToken));
/// <summary>
/// Connects the specified server.
@ -82,7 +82,7 @@ namespace MediaBrowser.Model.ApiClient
/// <param name="server">The server.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task&lt;ConnectionResult&gt;.</returns>
Task<ConnectionResult> Connect(ServerInfo server, CancellationToken cancellationToken);
Task<ConnectionResult> Connect(ServerInfo server, CancellationToken cancellationToken = default(CancellationToken));
/// <summary>
/// Connects the specified server.
@ -91,7 +91,7 @@ namespace MediaBrowser.Model.ApiClient
/// <param name="options">The options.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task&lt;ConnectionResult&gt;.</returns>
Task<ConnectionResult> Connect(ServerInfo server, ConnectionOptions options, CancellationToken cancellationToken);
Task<ConnectionResult> Connect(ServerInfo server, ConnectionOptions options, CancellationToken cancellationToken = default(CancellationToken));
/// <summary>
/// Connects the specified server.
@ -99,7 +99,7 @@ namespace MediaBrowser.Model.ApiClient
/// <param name="address">The address.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task&lt;ConnectionResult&gt;.</returns>
Task<ConnectionResult> Connect(string address, CancellationToken cancellationToken);
Task<ConnectionResult> Connect(string address, CancellationToken cancellationToken = default(CancellationToken));
/// <summary>
/// Logouts this instance.
@ -142,7 +142,7 @@ namespace MediaBrowser.Model.ApiClient
/// Gets the available servers.
/// </summary>
/// <param name="cancellationToken">The cancellation token.</param>
Task<List<ServerInfo>> GetAvailableServers(CancellationToken cancellationToken);
Task<List<ServerInfo>> GetAvailableServers(CancellationToken cancellationToken = default(CancellationToken));
/// <summary>
/// Authenticates an offline user with their password

2
MediaBrowser.Model/ApiClient/IDevice.cs
View File

@ -39,6 +39,6 @@ namespace MediaBrowser.Model.ApiClient
/// <param name="apiClient">The API client.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task.</returns>
Task UploadFile(LocalFileInfo file, IApiClient apiClient, CancellationToken cancellationToken);
Task UploadFile(LocalFileInfo file, IApiClient apiClient, CancellationToken cancellationToken = default(CancellationToken));
}
}