diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-10-17 12:48:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-17 12:48:23 -0400 |
| commit | 0fd99d2d08515341fbcd31daa011090bb073cfcd (patch) | |
| tree | ca299bed13c4a241482c5518ea0bc76f58b5326d /MediaBrowser.Api | |
| parent | b0147c32f9122c6ce695d2919176ed8b50b94fda (diff) | |
| parent | b0a75f086e9d48b840ff1594997f68282920f491 (diff) | |
Merge pull request #2242 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Api')
| -rw-r--r-- | MediaBrowser.Api/ItemUpdateService.cs | 14 | ||||
| -rw-r--r-- | MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs | 1 |
2 files changed, 3 insertions, 12 deletions
diff --git a/MediaBrowser.Api/ItemUpdateService.cs b/MediaBrowser.Api/ItemUpdateService.cs index 16e8a434a..78aa5e165 100644 --- a/MediaBrowser.Api/ItemUpdateService.cs +++ b/MediaBrowser.Api/ItemUpdateService.cs @@ -245,12 +245,8 @@ namespace MediaBrowser.Api item.OriginalTitle = string.IsNullOrWhiteSpace(request.OriginalTitle) ? null : request.OriginalTitle; - var hasCriticRating = item as IHasCriticRating; - if (hasCriticRating != null) - { - hasCriticRating.CriticRating = request.CriticRating; - hasCriticRating.CriticRatingSummary = request.CriticRatingSummary; - } + item.CriticRating = request.CriticRating; + item.CriticRatingSummary = request.CriticRatingSummary; item.DisplayMediaType = request.DisplayMediaType; item.CommunityRating = request.CommunityRating; @@ -279,11 +275,7 @@ namespace MediaBrowser.Api item.Tagline = request.Taglines.FirstOrDefault(); } - var hasShortOverview = item as IHasShortOverview; - if (hasShortOverview != null) - { - hasShortOverview.ShortOverview = request.ShortOverview; - } + item.ShortOverview = request.ShortOverview; item.Keywords = request.Keywords; diff --git a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs index 270b068fd..8dea9068d 100644 --- a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs +++ b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs @@ -886,7 +886,6 @@ namespace MediaBrowser.Api.Playback.Hls var mapArgs = state.IsOutputVideo ? GetMapArgs(state) : string.Empty; var enableSplittingOnNonKeyFrames = state.VideoRequest.EnableSplittingOnNonKeyFrames && string.Equals(state.OutputVideoCodec, "copy", StringComparison.OrdinalIgnoreCase); - enableSplittingOnNonKeyFrames = false; // TODO: check libavformat version for 57 50.100 and use -hls_flags split_by_time var hlsProtocolSupportsSplittingByTime = false; |