aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api/VideosService.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-08-17 01:38:13 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-08-17 01:38:13 -0400
commitcd1f09716713179e0be4124e73d84d7de6ba1bf5 (patch)
tree584468d982102238489a29abcca3129e769dadc9 /MediaBrowser.Api/VideosService.cs
parente2219020883bc36d9a8ba152db1b25b639ec3b45 (diff)
re-enable chromecast
Diffstat (limited to 'MediaBrowser.Api/VideosService.cs')
-rw-r--r--MediaBrowser.Api/VideosService.cs26
1 files changed, 6 insertions, 20 deletions
diff --git a/MediaBrowser.Api/VideosService.cs b/MediaBrowser.Api/VideosService.cs
index 2407a1a39..5ce1341b0 100644
--- a/MediaBrowser.Api/VideosService.cs
+++ b/MediaBrowser.Api/VideosService.cs
@@ -97,14 +97,7 @@ namespace MediaBrowser.Api
return ToOptimizedSerializedResultUsingCache(result);
}
- public void Delete(DeleteAlternateSources request)
- {
- var task = RemoveAlternateVersions(request);
-
- Task.WaitAll(task);
- }
-
- private async Task RemoveAlternateVersions(DeleteAlternateSources request)
+ public async Task Delete(DeleteAlternateSources request)
{
var video = (Video)_libraryManager.GetItemById(request.Id);
@@ -119,14 +112,7 @@ namespace MediaBrowser.Api
await video.UpdateToRepository(ItemUpdateType.MetadataDownload, CancellationToken.None).ConfigureAwait(false);
}
- public void Post(MergeVersions request)
- {
- var task = MergeVersions(request);
-
- Task.WaitAll(task);
- }
-
- private async Task MergeVersions(MergeVersions request)
+ public async Task Post(MergeVersions request)
{
var items = request.Ids.Split(',')
.Select(i => new Guid(i))
@@ -172,12 +158,12 @@ namespace MediaBrowser.Api
return 0;
})
.ThenByDescending(i =>
- {
- var stream = i.GetDefaultVideoStream();
+ {
+ var stream = i.GetDefaultVideoStream();
- return stream == null || stream.Width == null ? 0 : stream.Width.Value;
+ return stream == null || stream.Width == null ? 0 : stream.Width.Value;
- }).First();
+ }).First();
}
foreach (var item in videos.Where(i => i.Id != primaryVersion.Id))