From 3ba6364f259ea43979a88b2a83d64292119057dc Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 5 Aug 2014 19:59:24 -0400 Subject: fixes #887 - Support ttml subtitle output --- MediaBrowser.Server.Implementations/Dto/DtoService.cs | 14 +++----------- .../LiveTv/LiveTvManager.cs | 1 - MediaBrowser.Server.Implementations/Udp/UdpServer.cs | 2 +- 3 files changed, 4 insertions(+), 13 deletions(-) (limited to 'MediaBrowser.Server.Implementations') diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs index e3a386841..ace794b19 100644 --- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs +++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs @@ -112,6 +112,8 @@ namespace MediaBrowser.Server.Implementations.Dto var dto = new BaseItemDto(); + dto.SupportsPlaylists = item.SupportsAddingToPlaylist; + if (fields.Contains(ItemFields.People)) { AttachPeople(dto, item); @@ -849,17 +851,7 @@ namespace MediaBrowser.Server.Implementations.Dto if (fields.Contains(ItemFields.Overview)) { - // TODO: Remove this after a while, since it's been moved to the providers - if (item is MusicArtist) - { - var strippedOverview = string.IsNullOrEmpty(item.Overview) ? item.Overview : item.Overview.StripHtml(); - - dto.Overview = strippedOverview; - } - else - { - dto.Overview = item.Overview; - } + dto.Overview = item.Overview; } if (fields.Contains(ItemFields.ShortOverview)) diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs index 251acb02d..8ffe8aa63 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs @@ -12,7 +12,6 @@ using MediaBrowser.Controller.Localization; using MediaBrowser.Controller.Persistence; using MediaBrowser.Controller.Providers; using MediaBrowser.Controller.Sorting; -using MediaBrowser.Model.Configuration; using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; using MediaBrowser.Model.LiveTv; diff --git a/MediaBrowser.Server.Implementations/Udp/UdpServer.cs b/MediaBrowser.Server.Implementations/Udp/UdpServer.cs index e4626bec6..9028b540f 100644 --- a/MediaBrowser.Server.Implementations/Udp/UdpServer.cs +++ b/MediaBrowser.Server.Implementations/Udp/UdpServer.cs @@ -124,7 +124,7 @@ namespace MediaBrowser.Server.Implementations.Udp { Address = serverAddress, Id = _appHost.ServerId, - Name = _appHost.Name + Name = _appHost.FriendlyName }; await SendAsync(Encoding.UTF8.GetBytes(_json.SerializeToString(response)), endpoint); -- cgit v1.2.3