diff options
Diffstat (limited to 'MediaBrowser.Api')
| -rw-r--r-- | MediaBrowser.Api/ItemLookupService.cs | 7 | ||||
| -rw-r--r-- | MediaBrowser.Api/Library/LibraryService.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Api/Playback/BaseStreamingService.cs | 20 |
3 files changed, 2 insertions, 27 deletions
diff --git a/MediaBrowser.Api/ItemLookupService.cs b/MediaBrowser.Api/ItemLookupService.cs index 2ce7997a12..67167da999 100644 --- a/MediaBrowser.Api/ItemLookupService.cs +++ b/MediaBrowser.Api/ItemLookupService.cs @@ -147,13 +147,6 @@ namespace MediaBrowser.Api return ToOptimizedResult(result); } - public object Post(GetAdultVideoRemoteSearchResults request) - { - var result = _providerManager.GetRemoteSearchResults<AdultVideo, ItemLookupInfo>(request, CancellationToken.None).Result; - - return ToOptimizedResult(result); - } - public object Post(GetSeriesRemoteSearchResults request) { var result = _providerManager.GetRemoteSearchResults<Series, SeriesInfo>(request, CancellationToken.None).Result; diff --git a/MediaBrowser.Api/Library/LibraryService.cs b/MediaBrowser.Api/Library/LibraryService.cs index acb3f7835e..b1ee30c94e 100644 --- a/MediaBrowser.Api/Library/LibraryService.cs +++ b/MediaBrowser.Api/Library/LibraryService.cs @@ -406,7 +406,6 @@ namespace MediaBrowser.Api.Library var games = filteredItems.OfType<Game>().ToList(); var movies = filteredItems.OfType<Movie>().ToList(); var musicVideos = filteredItems.OfType<MusicVideo>().ToList(); - var adultVideos = filteredItems.OfType<AdultVideo>().ToList(); var boxsets = filteredItems.OfType<BoxSet>().ToList(); var books = filteredItems.OfType<Book>().ToList(); var songs = filteredItems.OfType<Audio>().ToList(); @@ -422,7 +421,6 @@ namespace MediaBrowser.Api.Library SeriesCount = series.Count, SongCount = songs.Count, MusicVideoCount = musicVideos.Count, - AdultVideoCount = adultVideos.Count, BoxSetCount = boxsets.Count, BookCount = books.Count, diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs index 74eb9c0129..fbdd1d6803 100644 --- a/MediaBrowser.Api/Playback/BaseStreamingService.cs +++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs @@ -1,5 +1,4 @@ -using System.Net.WebSockets; -using MediaBrowser.Common.Extensions; +using MediaBrowser.Common.Extensions; using MediaBrowser.Common.IO; using MediaBrowser.Controller.Channels; using MediaBrowser.Controller.Configuration; @@ -779,24 +778,9 @@ namespace MediaBrowser.Api.Playback private bool SupportsThrottleWithStream { - // TODO: These checks are a hack. - // They should go through the IHttpServer interface or IServerManager to find out this information - get { -#if __MonoCS__ - return true; -#endif - - try - { - new ClientWebSocket(); - return true; - } - catch - { - return false; - } + return false; } } |