aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-01-07 13:39:35 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-01-07 13:39:35 -0500
commit5392ff4da4794a0c4268baa61572a8cd881db379 (patch)
treed6a95ff3393fdfb44764bea77c820b6fa39bbcc1 /MediaBrowser.Controller
parent9862959354560e00331433ec6cd4276210e1a1c4 (diff)
added a new encoding settings page under advanced
Diffstat (limited to 'MediaBrowser.Controller')
-rw-r--r--MediaBrowser.Controller/LiveTv/ILiveTvManager.cs6
-rw-r--r--MediaBrowser.Controller/Providers/BaseMetadataProvider.cs2
2 files changed, 7 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
index ceca14f5bf..d23c8c5554 100644
--- a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
+++ b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
@@ -235,5 +235,11 @@ namespace MediaBrowser.Controller.LiveTv
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task.</returns>
Task CloseLiveStream(string id, CancellationToken cancellationToken);
+
+ /// <summary>
+ /// Gets the guide information.
+ /// </summary>
+ /// <returns>GuideInfo.</returns>
+ GuideInfo GetGuideInfo();
}
}
diff --git a/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs b/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs
index 67475b3295..3b499b487a 100644
--- a/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs
+++ b/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs
@@ -45,7 +45,7 @@ namespace MediaBrowser.Controller.Providers
protected static readonly Task<bool> FalseTaskResult = Task.FromResult(false);
- protected static readonly SemaphoreSlim XmlParsingResourcePool = new SemaphoreSlim(5, 5);
+ protected static readonly SemaphoreSlim XmlParsingResourcePool = new SemaphoreSlim(4, 4);
/// <summary>
/// Supportses the specified item.