diff options
| author | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-08-22 08:56:44 -0400 |
|---|---|---|
| committer | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-08-22 08:56:44 -0400 |
| commit | f2de85b5d9d0dcc3c922bc261d32df71870d6615 (patch) | |
| tree | c86b11cc193b56ce2be17882b8399e7b492d74af /MediaBrowser.Model | |
| parent | fbf8cc833c441de8890998600be044296acfc783 (diff) | |
Added VideoInfo to DTOBaseItem
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/DTO/DTOBaseItem.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.Model/DTO/VideoInfo.cs | 18 | ||||
| -rw-r--r-- | MediaBrowser.Model/Entities/Video.cs | 8 | ||||
| -rw-r--r-- | MediaBrowser.Model/MediaBrowser.Model.csproj | 1 |
4 files changed, 28 insertions, 2 deletions
diff --git a/MediaBrowser.Model/DTO/DTOBaseItem.cs b/MediaBrowser.Model/DTO/DTOBaseItem.cs index fb77c2595..53d921d45 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 000000000..5cff413f2 --- /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<SubtitleStream> Subtitles { get; set; }
+ public IEnumerable<AudioStream> AudioStreams { get; set; }
+ }
+}
diff --git a/MediaBrowser.Model/Entities/Video.cs b/MediaBrowser.Model/Entities/Video.cs index f947509c1..fab22abd3 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<string> Subtitles { get; set; }
+ public IEnumerable<SubtitleStream> Subtitles { get; set; }
public IEnumerable<AudioStream> 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 70e4c729e..c341dd046 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -34,6 +34,7 @@ <ItemGroup>
<Compile Include="DTO\AudioInfo.cs" />
<Compile Include="DTO\DTOBaseItem.cs" />
+ <Compile Include="DTO\VideoInfo.cs" />
<Compile Include="Entities\Audio.cs" />
<Compile Include="Entities\BaseEntity.cs" />
<Compile Include="Entities\BaseItem.cs" />
|