aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-05-18 12:40:20 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-05-18 12:40:20 -0400
commitdeb6e5a2ee11868491caaf57a16038e37836b29b (patch)
treebbb7e01d90231186d7ce2a6577aa8324d08b4ac2
parentd6d3a5fc24b1fd9c467cb06d8cc887e0b2c297b8 (diff)
update live tv media sources
-rw-r--r--MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs10
-rw-r--r--MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj3
2 files changed, 12 insertions, 1 deletions
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index 48ad3505a..d7a8828c0 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -351,7 +351,15 @@ namespace MediaBrowser.Server.Implementations.LiveTv
var item = GetInternalChannel(id);
var service = GetService(item);
- return await service.GetChannelStreamMediaSources(item.ExternalId, cancellationToken).ConfigureAwait(false);
+ var sources = await service.GetChannelStreamMediaSources(item.ExternalId, cancellationToken).ConfigureAwait(false);
+ var list = sources.ToList();
+
+ foreach (var source in list)
+ {
+ Normalize(source, item.ChannelType == ChannelType.TV);
+ }
+
+ return list;
}
private ILiveTvService GetService(ILiveTvItem item)
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 26f41837f..215fb5e5e 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -228,6 +228,9 @@
<Content Include="dashboard-ui\thirdparty\cordova\chromecast.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
+ <Content Include="dashboard-ui\thirdparty\cordova\connectsdk.js">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
<Content Include="dashboard-ui\thirdparty\cordova\imagestore.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>