Merge pull request #2797 from MediaBrowser/dev

Dev

Emby.Server.Implementations/Library/LibraryManager.cs

@@ -2395,8 +2395,7 @@ namespace Emby.Server.Implementations.Library
             var resolver = new EpisodeResolver(GetNamingOptions(),
                 new NullLogger());
 
-            var isFolder = episode.VideoType == VideoType.BluRay || episode.VideoType == VideoType.Dvd ||
-                           episode.VideoType == VideoType.HdDvd;
+            var isFolder = episode.VideoType == VideoType.BluRay || episode.VideoType == VideoType.Dvd;
 
             var locationType = episode.LocationType;
 

Emby.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs

@@ -178,11 +178,6 @@ namespace Emby.Server.Implementations.Library.Resolvers
                 {
                     video.VideoType = VideoType.Dvd;
                 }
-                else if (string.Equals(videoInfo.StubType, "hddvd", StringComparison.OrdinalIgnoreCase))
-                {
-                    video.VideoType = VideoType.HdDvd;
-                    video.IsHD = true;
-                }
                 else if (string.Equals(videoInfo.StubType, "bluray", StringComparison.OrdinalIgnoreCase))
                 {
                     video.VideoType = VideoType.BluRay;

Emby.Server.Implementations/MediaEncoder/EncodingManager.cs

@@ -117,7 +117,7 @@ namespace Emby.Server.Implementations.MediaEncoder
                 {
                     if (extractImages)
                     {
-                        if (video.VideoType == VideoType.HdDvd || video.VideoType == VideoType.Iso)
+                        if (video.VideoType == VideoType.Iso)
                         {
                             continue;
                         }

MediaBrowser.Controller/Entities/Video.cs

@@ -184,8 +184,7 @@ namespace MediaBrowser.Controller.Entities
 
         public override bool CanDownload()
         {
-            if (VideoType == VideoType.HdDvd || VideoType == VideoType.Dvd ||
-                VideoType == VideoType.BluRay)
+            if (VideoType == VideoType.Dvd || VideoType == VideoType.BluRay)
             {
                 return false;
             }
@@ -335,8 +334,7 @@ namespace MediaBrowser.Controller.Entities
 
                 if (!IsPlaceHolder)
                 {
-                    if (VideoType == VideoType.BluRay || VideoType == VideoType.Dvd ||
-                        VideoType == VideoType.HdDvd)
+                    if (VideoType == VideoType.BluRay || VideoType == VideoType.Dvd)
                     {
                         return Path;
                     }
@@ -353,7 +351,7 @@ namespace MediaBrowser.Controller.Entities
             {
                 if (LocationType == LocationType.FileSystem)
                 {
-                    if (VideoType == VideoType.BluRay || VideoType == VideoType.Dvd || VideoType == VideoType.HdDvd)
+                    if (VideoType == VideoType.BluRay || VideoType == VideoType.Dvd)
                     {
                         return System.IO.Path.GetFileName(Path);
                     }
@@ -398,6 +396,11 @@ namespace MediaBrowser.Controller.Entities
         /// <returns>List{System.String}.</returns>
         public List<string> GetPlayableStreamFiles(string rootPath)
         {
+            if (VideoType == VideoType.VideoFile)
+            {
+                return new List<string>();
+            }
+
             var allFiles = FileSystem.GetFilePaths(rootPath, true).ToList();
 
             var videoType = VideoType;
@@ -737,10 +740,6 @@ namespace MediaBrowser.Controller.Entities
             {
                 terms.Add("DVD");
             }
-            else if (video.VideoType == VideoType.HdDvd)
-            {
-                terms.Add("HD-DVD");
-            }
             else if (video.VideoType == VideoType.Iso)
             {
                 if (video.IsoType.HasValue)

MediaBrowser.Model/Entities/VideoType.cs

@@ -21,10 +21,6 @@ namespace MediaBrowser.Model.Entities
         /// <summary>
         /// The blu ray
         /// </summary>
-        BluRay,
-        /// <summary>
-        /// The hd DVD
-        /// </summary>
-        HdDvd
+        BluRay
     }
 }

MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs

@@ -141,11 +141,6 @@ namespace MediaBrowser.Providers.MediaInfo
                 return _cachedTask;
             }
 
-            if (item.VideoType == VideoType.HdDvd)
-            {
-                return _cachedTask;
-            }
-
             if (item.IsPlaceHolder)
             {
                 return _cachedTask;

MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs

@@ -39,7 +39,7 @@ namespace MediaBrowser.Providers.MediaInfo
             var video = (Video)item;
 
             // No support for this
-            if (video.VideoType == VideoType.HdDvd || video.IsPlaceHolder)
+            if (video.IsPlaceHolder)
             {
                 return Task.FromResult(new DynamicImageResponse { HasImage = false });
             }

MediaBrowser.XbmcMetadata/Savers/MovieNfoSaver.cs

@@ -35,7 +35,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
                 list.Add(Path.Combine(path, "VIDEO_TS", "VIDEO_TS.nfo"));
             }
 
-            if (!item.IsPlaceHolder && (item.VideoType == VideoType.Dvd || item.VideoType == VideoType.BluRay || item.VideoType == VideoType.HdDvd))
+            if (!item.IsPlaceHolder && (item.VideoType == VideoType.Dvd || item.VideoType == VideoType.BluRay))
             {
                 var path = item.ContainingFolderPath;
 

SharedVersion.cs

@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.2.26.16")]
+[assembly: AssemblyVersion("3.2.26.17")]