alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-03 06:18:28 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

update dlna profiles

Browse Source
This commit is contained in:
Luke Pulverenti
2014-04-22 13:25:54 -04:00
parent 4331700747
commit 54eb7cb855
83 changed files with 12782 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
MediaBrowser.Controller/Collections/ICollectionManager.cs
View File

@@ -1,4 +1,5 @@
using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Movies;
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
@@ -29,5 +30,13 @@ namespace MediaBrowser.Controller.Collections
/// <param name="itemIds">The item ids.</param>
/// <returns>Task.</returns>
Task RemoveFromCollection(Guid collectionId, IEnumerable<Guid> itemIds);
/// <summary>
/// Collapses the items within box sets.
/// </summary>
/// <param name="items">The items.</param>
/// <param name="user">The user.</param>
/// <returns>IEnumerable{BaseItem}.</returns>
IEnumerable<BaseItem> CollapseItemsWithinBoxSets(IEnumerable<BaseItem> items, User user);
}
}

1
MediaBrowser.Controller/Entities/Audio/Audio.cs
View File

@@ -15,6 +15,7 @@ namespace MediaBrowser.Controller.Entities.Audio
public string FormatName { get; set; }
public long? Size { get; set; }
public string Container { get; set; }
public int? TotalBitrate { get; set; }
public Audio()
{

4
MediaBrowser.Controller/Entities/CollectionFolder.cs
View File

@@ -129,14 +129,13 @@ namespace MediaBrowser.Controller.Entities
return NullTaskResult;
}
private List<LinkedChild> _linkedChildren;
/// <summary>
/// Our children are actually just references to the ones in the physical root...
/// </summary>
/// <value>The linked children.</value>
public override List<LinkedChild> LinkedChildren
{
get { return _linkedChildren ?? (_linkedChildren = GetLinkedChildrenInternal()); }
get { return GetLinkedChildrenInternal(); }
set
{
base.LinkedChildren = value;
@@ -175,7 +174,6 @@ namespace MediaBrowser.Controller.Entities
public void ResetDynamicChildren()
{
_actualChildren = null;
_linkedChildren = null;
}
}
}

1
MediaBrowser.Controller/Entities/Video.cs
View File

@@ -29,6 +29,7 @@ namespace MediaBrowser.Controller.Entities
public string FormatName { get; set; }
public long? Size { get; set; }
public string Container { get; set; }
public int? TotalBitrate { get; set; }
public Video()
{

5
MediaBrowser.Controller/MediaEncoding/MediaEncoderHelpers.cs
View File

@@ -134,6 +134,11 @@ namespace MediaBrowser.Controller.MediaEncoding
if (data.format != null)
{
info.Format = data.format.format_name;
if (!string.IsNullOrEmpty(data.format.bit_rate))
{
info.TotalBitrate = int.Parse(data.format.bit_rate, UsCulture);
}
}
return info;