alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-16 03:03:40 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge branch 'master' into media-type

Browse Source
This commit is contained in:
Cody Robibero
2023-11-09 22:03:55 -07:00
committed by GitHub
parent 35bd0c00c9 44b771bfb4
commit 892973a9e3
341 changed files with 6212 additions and 2500 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
MediaBrowser.Model/Dto/BaseItemDto.cs
View File

@@ -3,6 +3,7 @@
using System;
using System.Collections.Generic;
using Jellyfin.Data.Entities;
using Jellyfin.Data.Enums;
using MediaBrowser.Model.Drawing;
using MediaBrowser.Model.Entities;
@@ -419,7 +420,7 @@ namespace MediaBrowser.Model.Dto
/// Gets or sets the type of the collection.
/// </summary>
/// <value>The type of the collection.</value>
public string CollectionType { get; set; }
public CollectionType? CollectionType { get; set; }
/// <summary>
/// Gets or sets the display order.
@@ -568,6 +569,12 @@ namespace MediaBrowser.Model.Dto
/// <value>The chapters.</value>
public List<ChapterInfo> Chapters { get; set; }
/// <summary>
/// Gets or sets the trickplay manifest.
/// </summary>
/// <value>The trickplay manifest.</value>
public Dictionary<string, Dictionary<int, TrickplayInfo>> Trickplay { get; set; }
/// <summary>
/// Gets or sets the type of the location.
/// </summary>

3
MediaBrowser.Model/Dto/MetadataEditorInfo.cs
View File

@@ -2,6 +2,7 @@
using System;
using System.Collections.Generic;
using Jellyfin.Data.Enums;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Globalization;
using MediaBrowser.Model.Providers;
@@ -27,7 +28,7 @@ namespace MediaBrowser.Model.Dto
public IReadOnlyList<ExternalIdInfo> ExternalIdInfos { get; set; }
public string? ContentType { get; set; }
public CollectionType? ContentType { get; set; }
public IReadOnlyList<NameValuePair> ContentTypeOptions { get; set; }
}