diff options
| author | Techywarrior <techywarrior@gmail.com> | 2013-03-28 19:57:47 -0700 |
|---|---|---|
| committer | Techywarrior <techywarrior@gmail.com> | 2013-03-28 19:57:47 -0700 |
| commit | 67862d0a41066a7063d8a948d5a7f6e3f67156e5 (patch) | |
| tree | ddb76310144cbc3039ad56a2839bb6ee284da073 /MediaBrowser.Controller | |
| parent | 3d566d2f6b73f149ae0a5a953a4db33e2dd82ca1 (diff) | |
| parent | b0d1fc86743f2829a45f12340eb9ee959a12e19f (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Providers/Movies/FanArtMovieProvider.cs | 5 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Providers/TV/FanArtTVProvider.cs | 8 |
2 files changed, 4 insertions, 9 deletions
diff --git a/MediaBrowser.Controller/Providers/Movies/FanArtMovieProvider.cs b/MediaBrowser.Controller/Providers/Movies/FanArtMovieProvider.cs index af613f0233..7079f3330d 100644 --- a/MediaBrowser.Controller/Providers/Movies/FanArtMovieProvider.cs +++ b/MediaBrowser.Controller/Providers/Movies/FanArtMovieProvider.cs @@ -19,11 +19,6 @@ namespace MediaBrowser.Controller.Providers.Movies /// </summary> class FanArtMovieProvider : FanartBaseProvider, IDisposable { - /// <summary> - /// The fan art - /// </summary> - internal readonly SemaphoreSlim FanArtResourcePool = new SemaphoreSlim(5, 5); - internal static FanArtMovieProvider Current { get; private set; } /// <summary> diff --git a/MediaBrowser.Controller/Providers/TV/FanArtTVProvider.cs b/MediaBrowser.Controller/Providers/TV/FanArtTVProvider.cs index 5690ba47f5..982997ad3b 100644 --- a/MediaBrowser.Controller/Providers/TV/FanArtTVProvider.cs +++ b/MediaBrowser.Controller/Providers/TV/FanArtTVProvider.cs @@ -69,7 +69,7 @@ namespace MediaBrowser.Controller.Providers.TV try { - using (var xml = await HttpClient.Get(url, FanArtMovieProvider.Current.FanArtResourcePool, cancellationToken).ConfigureAwait(false)) + using (var xml = await HttpClient.Get(url, FanArtResourcePool, cancellationToken).ConfigureAwait(false)) { doc.Load(xml); } @@ -93,7 +93,7 @@ namespace MediaBrowser.Controller.Providers.TV Logger.Debug("FanArtProvider getting ClearLogo for " + series.Name); try { - series.SetImage(ImageType.Logo, await _providerManager.DownloadAndSaveImage(series, path, LOGO_FILE, FanArtMovieProvider.Current.FanArtResourcePool, cancellationToken).ConfigureAwait(false)); + series.SetImage(ImageType.Logo, await _providerManager.DownloadAndSaveImage(series, path, LOGO_FILE, FanArtResourcePool, cancellationToken).ConfigureAwait(false)); } catch (HttpException) { @@ -117,7 +117,7 @@ namespace MediaBrowser.Controller.Providers.TV Logger.Debug("FanArtProvider getting ClearArt for " + series.Name); try { - series.SetImage(ImageType.Art, await _providerManager.DownloadAndSaveImage(series, path, ART_FILE, FanArtMovieProvider.Current.FanArtResourcePool, cancellationToken).ConfigureAwait(false)); + series.SetImage(ImageType.Art, await _providerManager.DownloadAndSaveImage(series, path, ART_FILE, FanArtResourcePool, cancellationToken).ConfigureAwait(false)); } catch (HttpException) { @@ -141,7 +141,7 @@ namespace MediaBrowser.Controller.Providers.TV Logger.Debug("FanArtProvider getting ThumbArt for " + series.Name); try { - series.SetImage(ImageType.Disc, await _providerManager.DownloadAndSaveImage(series, path, THUMB_FILE, FanArtMovieProvider.Current.FanArtResourcePool, cancellationToken).ConfigureAwait(false)); + series.SetImage(ImageType.Disc, await _providerManager.DownloadAndSaveImage(series, path, THUMB_FILE, FanArtResourcePool, cancellationToken).ConfigureAwait(false)); } catch (HttpException) { |