diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-03-16 22:46:21 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-03-16 22:46:21 -0400 |
| commit | be6d4c3f530bbdd787b353996f42275187821716 (patch) | |
| tree | c07ec91123dcce7f66d53c1a70af05f3f8564516 | |
| parent | c04e226c09d226906c0ab408a0f74922c7518675 (diff) | |
added archive interface
| -rw-r--r-- | MediaBrowser.Api/Playback/StreamState.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/Audio/Audio.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/IArchivable.cs | 8 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/Video.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.Controller/MediaBrowser.Controller.csproj | 1 |
5 files changed, 16 insertions, 4 deletions
diff --git a/MediaBrowser.Api/Playback/StreamState.cs b/MediaBrowser.Api/Playback/StreamState.cs index e3eb4e128..6bbcef591 100644 --- a/MediaBrowser.Api/Playback/StreamState.cs +++ b/MediaBrowser.Api/Playback/StreamState.cs @@ -56,6 +56,7 @@ namespace MediaBrowser.Api.Playback public MediaProtocol InputProtocol { get; set; } public bool IsInputVideo { get; set; } + public bool IsInputArchive { get; set; } public VideoType VideoType { get; set; } public IsoType? IsoType { get; set; } @@ -112,6 +113,7 @@ namespace MediaBrowser.Api.Playback public long? EncodingDurationTicks { get; set; } public string ItemType { get; set; } + public string ItemId { get; set; } public string GetMimeType(string outputPath) { diff --git a/MediaBrowser.Controller/Entities/Audio/Audio.cs b/MediaBrowser.Controller/Entities/Audio/Audio.cs index c033b144a..100633d7f 100644 --- a/MediaBrowser.Controller/Entities/Audio/Audio.cs +++ b/MediaBrowser.Controller/Entities/Audio/Audio.cs @@ -1,5 +1,4 @@ -using MediaBrowser.Controller.Persistence; -using MediaBrowser.Controller.Providers; +using MediaBrowser.Controller.Providers; using MediaBrowser.Model.Configuration; using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; @@ -22,7 +21,8 @@ namespace MediaBrowser.Controller.Entities.Audio IHasLookupInfo<SongInfo>, IHasTags, IHasMediaSources, - IThemeMedia + IThemeMedia, + IArchivable { public string FormatName { get; set; } public long? Size { get; set; } diff --git a/MediaBrowser.Controller/Entities/IArchivable.cs b/MediaBrowser.Controller/Entities/IArchivable.cs new file mode 100644 index 000000000..575d203a7 --- /dev/null +++ b/MediaBrowser.Controller/Entities/IArchivable.cs @@ -0,0 +1,8 @@ + +namespace MediaBrowser.Controller.Entities +{ + public interface IArchivable + { + bool IsArchive { get; } + } +} diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs index dd774c1ed..ba84beca3 100644 --- a/MediaBrowser.Controller/Entities/Video.cs +++ b/MediaBrowser.Controller/Entities/Video.cs @@ -24,7 +24,8 @@ namespace MediaBrowser.Controller.Entities IHasMediaSources, IHasShortOverview, IHasPreferredMetadataLanguage, - IThemeMedia + IThemeMedia, + IArchivable { public Guid? PrimaryVersionId { get; set; } diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index 06f18729b..2a3e23d46 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -130,6 +130,7 @@ <Compile Include="Entities\Game.cs" /> <Compile Include="Entities\GameGenre.cs" /> <Compile Include="Entities\GameSystem.cs" /> + <Compile Include="Entities\IArchivable.cs" /> <Compile Include="Entities\IByReferenceItem.cs" /> <Compile Include="Entities\IHasAspectRatio.cs" /> <Compile Include="Entities\IHasBudget.cs" /> |
