diff options
Diffstat (limited to 'MediaBrowser.Api')
| -rw-r--r-- | MediaBrowser.Api/Playback/Progressive/AudioService.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Api/UserService.cs | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/MediaBrowser.Api/Playback/Progressive/AudioService.cs b/MediaBrowser.Api/Playback/Progressive/AudioService.cs index 12aac0ccbd..a7bcbf821e 100644 --- a/MediaBrowser.Api/Playback/Progressive/AudioService.cs +++ b/MediaBrowser.Api/Playback/Progressive/AudioService.cs @@ -15,7 +15,7 @@ namespace MediaBrowser.Api.Playback.Progressive [Route("/Audio/{Id}/stream.flac", "GET")] [Route("/Audio/{Id}/stream.ogg", "GET")] [Route("/Audio/{Id}/stream.oga", "GET")] - [Route("/Audio/{Id}/stream.webma", "GET")] + [Route("/Audio/{Id}/stream.webm", "GET")] [Route("/Audio/{Id}/stream", "GET")] [Route("/Audio/{Id}/stream.mp3", "HEAD")] [Route("/Audio/{Id}/stream.wma", "HEAD")] @@ -23,7 +23,7 @@ namespace MediaBrowser.Api.Playback.Progressive [Route("/Audio/{Id}/stream.flac", "HEAD")] [Route("/Audio/{Id}/stream.ogg", "HEAD")] [Route("/Audio/{Id}/stream.oga", "HEAD")] - [Route("/Audio/{Id}/stream.webma", "HEAD")] + [Route("/Audio/{Id}/stream.webm", "HEAD")] [Route("/Audio/{Id}/stream", "HEAD")] [Api(Description = "Gets an audio stream")] public class GetAudioStream : StreamRequest diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs index f2a9ca24b5..a27e3cc325 100644 --- a/MediaBrowser.Api/UserService.cs +++ b/MediaBrowser.Api/UserService.cs @@ -167,11 +167,9 @@ namespace MediaBrowser.Api { var dtoBuilder = new DtoBuilder(Logger, _libraryManager, _userManager); - var tasks = _userManager.Users.OrderBy(u => u.Name).Select(dtoBuilder.GetUserDto).ToArray(); + var users = _userManager.Users.OrderBy(u => u.Name).Select(dtoBuilder.GetUserDto).ToArray(); - var task = Task.WhenAll(tasks); - - return ToOptimizedResult(task.Result); + return ToOptimizedResult(users); } /// <summary> @@ -188,7 +186,7 @@ namespace MediaBrowser.Api throw new ResourceNotFoundException("User not found"); } - var result = new DtoBuilder(Logger, _libraryManager, _userManager).GetUserDto(user).Result; + var result = new DtoBuilder(Logger, _libraryManager, _userManager).GetUserDto(user); return ToOptimizedResult(result); } @@ -302,7 +300,7 @@ namespace MediaBrowser.Api newUser.UpdateConfiguration(dtoUser.Configuration, _xmlSerializer); - var result = new DtoBuilder(Logger, _libraryManager, _userManager).GetUserDto(newUser).Result; + var result = new DtoBuilder(Logger, _libraryManager, _userManager).GetUserDto(newUser); return ToOptimizedResult(result); } |