deprecate hddvd videotype

pull/1154/head
Luke Pulverenti 7 years ago
parent 6d78824c8e
commit 994720c24a

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

@ -178,11 +178,6 @@ namespace Emby.Server.Implementations.Library.Resolvers
{ {
video.VideoType = VideoType.Dvd; 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)) else if (string.Equals(videoInfo.StubType, "bluray", StringComparison.OrdinalIgnoreCase))
{ {
video.VideoType = VideoType.BluRay; video.VideoType = VideoType.BluRay;

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

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

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

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

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

@ -35,7 +35,7 @@ namespace MediaBrowser.XbmcMetadata.Savers
list.Add(Path.Combine(path, "VIDEO_TS", "VIDEO_TS.nfo")); 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; var path = item.ContainingFolderPath;

Loading…
Cancel
Save