aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MediaBrowser.Api/LiveTv/LiveTvService.cs5
-rw-r--r--MediaBrowser.ServerApplication/ApplicationHost.cs2
2 files changed, 3 insertions, 4 deletions
diff --git a/MediaBrowser.Api/LiveTv/LiveTvService.cs b/MediaBrowser.Api/LiveTv/LiveTvService.cs
index a7a709aee..579517aeb 100644
--- a/MediaBrowser.Api/LiveTv/LiveTvService.cs
+++ b/MediaBrowser.Api/LiveTv/LiveTvService.cs
@@ -42,10 +42,7 @@ namespace MediaBrowser.Api.LiveTv
public object Get(GetChannels request)
{
- var services = _liveTvManager.Services;
-
- var result = services.Select(GetServiceInfo)
- .ToList();
+ var result = GetChannelsAsync(request).Result;
return ToOptimizedResult(result);
}
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index f921f1c11..3090ad033 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -455,6 +455,8 @@ namespace MediaBrowser.ServerApplication
SessionManager.AddParts(GetExports<ISessionRemoteController>());
ImageProcessor.AddParts(GetExports<IImageEnhancer>());
+
+ LiveTvManager.AddParts(GetExports<ILiveTvService>());
}
/// <summary>