From f2de85b5d9d0dcc3c922bc261d32df71870d6615 Mon Sep 17 00:00:00 2001 From: LukePulverenti Luke Pulverenti luke pulverenti Date: Wed, 22 Aug 2012 08:56:44 -0400 Subject: Added VideoInfo to DTOBaseItem --- MediaBrowser.Model/DTO/DTOBaseItem.cs | 3 ++- MediaBrowser.Model/DTO/VideoInfo.cs | 18 ++++++++++++++++++ MediaBrowser.Model/Entities/Video.cs | 8 +++++++- MediaBrowser.Model/MediaBrowser.Model.csproj | 1 + 4 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 MediaBrowser.Model/DTO/VideoInfo.cs (limited to 'MediaBrowser.Model') diff --git a/MediaBrowser.Model/DTO/DTOBaseItem.cs b/MediaBrowser.Model/DTO/DTOBaseItem.cs index fb77c25957..53d921d45c 100644 --- a/MediaBrowser.Model/DTO/DTOBaseItem.cs +++ b/MediaBrowser.Model/DTO/DTOBaseItem.cs @@ -91,7 +91,8 @@ namespace MediaBrowser.Model.DTO public ItemSpecialCounts SpecialCounts { get; set; } public AudioInfo AudioInfo { get; set; } - + public VideoInfo VideoInfo { get; set; } + public bool IsType(Type type) { return IsType(type.Name); diff --git a/MediaBrowser.Model/DTO/VideoInfo.cs b/MediaBrowser.Model/DTO/VideoInfo.cs new file mode 100644 index 0000000000..5cff413f29 --- /dev/null +++ b/MediaBrowser.Model/DTO/VideoInfo.cs @@ -0,0 +1,18 @@ +using System.Collections.Generic; +using MediaBrowser.Model.Entities; + +namespace MediaBrowser.Model.DTO +{ + public class VideoInfo + { + public string Codec { get; set; } + public int Height { get; set; } + public int Width { get; set; } + public string ScanType { get; set; } + + public VideoType VideoType { get; set; } + + public IEnumerable Subtitles { get; set; } + public IEnumerable AudioStreams { get; set; } + } +} diff --git a/MediaBrowser.Model/Entities/Video.cs b/MediaBrowser.Model/Entities/Video.cs index f947509c18..fab22abd37 100644 --- a/MediaBrowser.Model/Entities/Video.cs +++ b/MediaBrowser.Model/Entities/Video.cs @@ -6,7 +6,7 @@ namespace MediaBrowser.Model.Entities { public VideoType VideoType { get; set; } - public IEnumerable Subtitles { get; set; } + public IEnumerable Subtitles { get; set; } public IEnumerable AudioStreams { get; set; } public int Height { get; set; } @@ -25,6 +25,12 @@ namespace MediaBrowser.Model.Entities public int Channels { get; set; } public int SampleRate { get; set; } public bool IsDefault { get; set; } + } + + public class SubtitleStream + { + public string Language { get; set; } + public bool IsDefault { get; set; } public bool IsForced { get; set; } } diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index 70e4c729e7..c341dd046b 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -34,6 +34,7 @@ + -- cgit v1.2.3