Merge pull request #2951 from MediaBrowser/dev

Dev

5 files changed, 33 insertions, 58 deletions

diff --git a/MediaBrowser.Controller/Entities/UserViewBuilder.cs b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
index acc452fbc..97b96127a 100644
--- a/MediaBrowser.Controller/Entities/UserViewBuilder.cs
+++ b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
@@ -262,14 +262,14 @@ namespace MediaBrowser.Controller.Entities
 
             var list = new List<BaseItem>();
 
-            list.Add(GetUserView(SpecialFolder.MusicLatest, "0", parent));
-            list.Add(GetUserView(SpecialFolder.MusicPlaylists, "1", parent));
-            list.Add(GetUserView(SpecialFolder.MusicAlbums, "2", parent));
-            list.Add(GetUserView(SpecialFolder.MusicAlbumArtists, "3", parent));
-            list.Add(GetUserView(SpecialFolder.MusicArtists, "4", parent));
-            list.Add(GetUserView(SpecialFolder.MusicSongs, "5", parent));
-            list.Add(GetUserView(SpecialFolder.MusicGenres, "6", parent));
-            list.Add(GetUserView(SpecialFolder.MusicFavorites, "7", parent));
+            list.Add(GetUserView(SpecialFolder.MusicLatest, "Latest", "0", parent));
+            list.Add(GetUserView(SpecialFolder.MusicPlaylists, "Playlists", "1", parent));
+            list.Add(GetUserView(SpecialFolder.MusicAlbums, "Albums", "2", parent));
+            list.Add(GetUserView(SpecialFolder.MusicAlbumArtists, "HeaderAlbumArtists", "3", parent));
+            list.Add(GetUserView(SpecialFolder.MusicArtists, "Artists", "4", parent));
+            list.Add(GetUserView(SpecialFolder.MusicSongs, "Songs", "5", parent));
+            list.Add(GetUserView(SpecialFolder.MusicGenres, "Genres", "6", parent));
+            list.Add(GetUserView(SpecialFolder.MusicFavorites, "Favorites", "7", parent));
 
             return GetResult(list, parent, query);
         }
@@ -278,9 +278,9 @@ namespace MediaBrowser.Controller.Entities
         {
             var list = new List<BaseItem>();
 
-            list.Add(GetUserView(SpecialFolder.MusicFavoriteAlbums, "0", parent));
-            list.Add(GetUserView(SpecialFolder.MusicFavoriteArtists, "1", parent));
-            list.Add(GetUserView(SpecialFolder.MusicFavoriteSongs, "2", parent));
+            list.Add(GetUserView(SpecialFolder.MusicFavoriteAlbums, "HeaderFavoriteAlbums", "0", parent));
+            list.Add(GetUserView(SpecialFolder.MusicFavoriteArtists, "HeaderFavoriteArtists", "1", parent));
+            list.Add(GetUserView(SpecialFolder.MusicFavoriteSongs, "HeaderFavoriteSongs", "2", parent));
 
             return GetResult(list, parent, query);
         }
@@ -443,12 +443,12 @@ namespace MediaBrowser.Controller.Entities
 
             var list = new List<BaseItem>();
 
-            list.Add(GetUserView(SpecialFolder.MovieResume, "0", parent));
-            list.Add(GetUserView(SpecialFolder.MovieLatest, "1", parent));
-            list.Add(GetUserView(SpecialFolder.MovieMovies, "2", parent));
-            list.Add(GetUserView(SpecialFolder.MovieCollections, "3", parent));
-            list.Add(GetUserView(SpecialFolder.MovieFavorites, "4", parent));
-            list.Add(GetUserView(SpecialFolder.MovieGenres, "5", parent));
+            list.Add(GetUserView(SpecialFolder.MovieResume, "HeaderContinueWatching", "0", parent));
+            list.Add(GetUserView(SpecialFolder.MovieLatest, "Latest", "1", parent));
+            list.Add(GetUserView(SpecialFolder.MovieMovies, "Movies", "2", parent));
+            list.Add(GetUserView(SpecialFolder.MovieCollections, "Collections", "3", parent));
+            list.Add(GetUserView(SpecialFolder.MovieFavorites, "Favorites", "4", parent));
+            list.Add(GetUserView(SpecialFolder.MovieGenres, "Genres", "5", parent));
 
             return GetResult(list, parent, query);
         }
@@ -564,7 +564,7 @@ namespace MediaBrowser.Controller.Entities
 
                 })
                 .Where(i => i != null)
-                .Select(i => GetUserView(i.Name, SpecialFolder.MovieGenre, i.SortName, parent));
+                .Select(i => GetUserViewWithName(i.Name, SpecialFolder.MovieGenre, i.SortName, parent));
 
             return GetResult(genres, parent, query);
         }
@@ -613,13 +613,13 @@ namespace MediaBrowser.Controller.Entities
 
             var list = new List<BaseItem>();
 
-            list.Add(GetUserView(SpecialFolder.TvResume, "0", parent));
-            list.Add(GetUserView(SpecialFolder.TvNextUp, "1", parent));
-            list.Add(GetUserView(SpecialFolder.TvLatest, "2", parent));
-            list.Add(GetUserView(SpecialFolder.TvShowSeries, "3", parent));
-            list.Add(GetUserView(SpecialFolder.TvFavoriteSeries, "4", parent));
-            list.Add(GetUserView(SpecialFolder.TvFavoriteEpisodes, "5", parent));
-            list.Add(GetUserView(SpecialFolder.TvGenres, "6", parent));
+            list.Add(GetUserView(SpecialFolder.TvResume, "HeaderContinueWatching", "0", parent));
+            list.Add(GetUserView(SpecialFolder.TvNextUp, "HeaderNextUp", "1", parent));
+            list.Add(GetUserView(SpecialFolder.TvLatest, "Latest", "2", parent));
+            list.Add(GetUserView(SpecialFolder.TvShowSeries, "Shows", "3", parent));
+            list.Add(GetUserView(SpecialFolder.TvFavoriteSeries, "HeaderFavoriteShows", "4", parent));
+            list.Add(GetUserView(SpecialFolder.TvFavoriteEpisodes, "HeaderFavoriteEpisodes", "5", parent));
+            list.Add(GetUserView(SpecialFolder.TvGenres, "Genres", "6", parent));
 
             return GetResult(list, parent, query);
         }
@@ -703,7 +703,7 @@ namespace MediaBrowser.Controller.Entities
 
                 })
                 .Where(i => i != null)
-                .Select(i => GetUserView(i.Name, SpecialFolder.TvGenre, i.SortName, parent));
+                .Select(i => GetUserViewWithName(i.Name, SpecialFolder.TvGenre, i.SortName, parent));
 
             return GetResult(genres, parent, query);
         }
@@ -1736,20 +1736,20 @@ namespace MediaBrowser.Controller.Entities
             var list = new List<BaseItem>();
 
             //list.Add(await GetUserSubView(SpecialFolder.LiveTvNowPlaying, user, "0", parent).ConfigureAwait(false));
-            list.Add(GetUserView(SpecialFolder.LiveTvChannels, string.Empty, user.RootFolder));
-            list.Add(GetUserView(SpecialFolder.LiveTvRecordingGroups, string.Empty, user.RootFolder));
+            list.Add(GetUserView(SpecialFolder.LiveTvChannels, "Channels", string.Empty, user.RootFolder));
+            list.Add(GetUserView(SpecialFolder.LiveTvRecordingGroups, "HeaderRecordingGroups", string.Empty, user.RootFolder));
 
             return GetResult(list, queryParent, query);
         }
 
-        private UserView GetUserView(string name, string type, string sortName, BaseItem parent)
+        private UserView GetUserViewWithName(string name, string type, string sortName, BaseItem parent)
         {
             return _userViewManager.GetUserSubView(name, parent.Id.ToString("N"), type, sortName, CancellationToken.None);
         }
 
-        private UserView GetUserView(string type, string sortName, BaseItem parent)
+        private UserView GetUserView(string type, string localizationKey, string sortName, BaseItem parent)
         {
-            return _userViewManager.GetUserSubView(parent.Id.ToString("N"), type, sortName, CancellationToken.None);
+            return _userViewManager.GetUserSubView(parent.Id.ToString("N"), type, localizationKey, sortName, CancellationToken.None);
         }
 
         public static IEnumerable<BaseItem> FilterForAdjacency(List<BaseItem> list, string adjacentToId)
diff --git a/MediaBrowser.Controller/Library/IUserViewManager.cs b/MediaBrowser.Controller/Library/IUserViewManager.cs
index ac37dc869..baecdd748 100644
--- a/MediaBrowser.Controller/Library/IUserViewManager.cs
+++ b/MediaBrowser.Controller/Library/IUserViewManager.cs
@@ -13,9 +13,9 @@ namespace MediaBrowser.Controller.Library
     {
         Task<Folder[]> GetUserViews(UserViewQuery query, CancellationToken cancellationToken);
 
-        UserView GetUserSubView(string name, string parentId, string type, string sortName, CancellationToken cancellationToken);
+        UserView GetUserSubViewWithName(string name, string parentId, string type, string sortName, CancellationToken cancellationToken);
 
-        UserView GetUserSubView(string category, string type, string sortName, CancellationToken cancellationToken);
+        UserView GetUserSubView(string category, string type, string localizationKey, string sortName, CancellationToken cancellationToken);
 
         List<Tuple<BaseItem, List<BaseItem>>> GetLatestItems(LatestItemsQuery request, DtoOptions options);
     }
diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
index 56f2353f1..4934cc1ca 100644
--- a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
+++ b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
@@ -76,16 +76,6 @@ namespace MediaBrowser.Controller.LiveTv
         void AddParts(IEnumerable<ILiveTvService> services, IEnumerable<ITunerHost> tunerHosts, IEnumerable<IListingsProvider> listingProviders);
 
         /// <summary>
-        /// Gets the recording.
-        /// </summary>
-        /// <param name="id">The identifier.</param>
-        /// <param name="options">The options.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <param name="user">The user.</param>
-        /// <returns>Task{RecordingInfoDto}.</returns>
-        Task<BaseItemDto> GetRecording(string id, DtoOptions options, CancellationToken cancellationToken, User user = null);
-
-        /// <summary>
         /// Gets the timer.
         /// </summary>
         /// <param name="id">The identifier.</param>
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index e7c768c3b..bddafe9a6 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -794,11 +794,6 @@ namespace MediaBrowser.Controller.MediaEncoding
                 return false;
             }
 
-            if (state.EnableMpDecimate)
-            {
-                return false;
-            }
-
             if (videoStream.IsInterlaced)
             {
                 if (state.DeInterlace(videoStream.Codec, false))
@@ -1515,11 +1510,6 @@ namespace MediaBrowser.Controller.MediaEncoding
                 }
             }
 
-            if (state.EnableMpDecimate)
-            {
-                filters.Add("mpdecimate,setpts=N/FRAME_RATE/TB");
-            }
-
             if (filters.Count > 0)
             {
                 output += string.Format(" -vf \"{0}\"", string.Join(",", filters.ToArray()));
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
index 506fce3ca..ad131064c 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
@@ -127,11 +127,6 @@ namespace MediaBrowser.Controller.MediaEncoding
             }
         }
 
-        public bool EnableMpDecimate
-        {
-            get { return MediaSource.EnableMpDecimate; }
-        }
-
         public string AlbumCoverPath { get; set; }
 
         public string InputAudioSync { get; set; }