open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updated ffmpeg. cleaned up some unused api properties

Browse Source
pull/702/head
LukePulverenti 11 years ago
parent 3acfd73d86
commit c7d2b3a407
16 changed files with 44 additions and 58 deletions
Show Stats Download Patch File Download Diff File

3
MediaBrowser.Controller/Library/DtoBuilder.cs
Unescape View File

@ -367,9 +367,6 @@ namespace MediaBrowser.Controller.Library
{
var folder = (Folder)item;
dto.IsRoot = folder.IsRoot;
dto.IsVirtualFolder = folder.IsVirtualFolder;
if (fields.Contains(ItemFields.IndexOptions))
{
dto.IndexOptions = folder.IndexByOptionStrings.ToArray();

2
MediaBrowser.Controller/MediaBrowser.Controller.csproj
Unescape View File

@ -202,7 +202,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="MediaInfo\ffmpeg20130209.zip" />
<EmbeddedResource Include="MediaInfo\ffmpeg20130310.zip" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>

1
MediaBrowser.Controller/MediaInfo/ffmpeg20130209.zip.REMOVED.git-id
Unescape View File

@ -1 +0,0 @@
985770c0d2633a13719be2e5cf19554262415f62

1
MediaBrowser.Controller/MediaInfo/ffmpeg20130310.zip.REMOVED.git-id
Unescape View File

@ -0,0 +1 @@
a005e50576665b191cbd02b42d6260bffb764690

68
MediaBrowser.Model/DTO/BaseItemDto.cs
Unescape View File

@ -154,20 +154,6 @@ namespace MediaBrowser.Model.Dto
[ProtoMember(25)]
public bool IsFolder { get; set; }
/// <summary>
/// If the item is a Folder this will determine if it's the Root or not
/// </summary>
/// <value><c>null</c> if [is root] contains no value, <c>true</c> if [is root]; otherwise, <c>false</c>.</value>
[ProtoMember(26)]
public bool? IsRoot { get; set; }
/// <summary>
/// If the item is a Folder this will determine if it's a VF or not
/// </summary>
/// <value><c>null</c> if [is virtual folder] contains no value, <c>true</c> if [is virtual folder]; otherwise, <c>false</c>.</value>
[ProtoMember(27)]
public bool? IsVirtualFolder { get; set; }
/// <summary>
/// Gets or sets the parent id.
/// </summary>
@ -391,26 +377,6 @@ namespace MediaBrowser.Model.Dto
return Type.Equals(type, StringComparison.OrdinalIgnoreCase);
}
/// <summary>
/// Gets a value indicating whether this instance can resume.
/// </summary>
/// <value><c>true</c> if this instance can resume; otherwise, <c>false</c>.</value>
[IgnoreDataMember]
public bool CanResume
{
get { return UserData != null && UserData.PlaybackPositionTicks > 0; }
}
/// <summary>
/// Gets the resume position ticks.
/// </summary>
/// <value>The resume position ticks.</value>
[IgnoreDataMember]
public long ResumePositionTicks
{
get { return UserData == null ? 0 : UserData.PlaybackPositionTicks; }
}
/// <summary>
/// Gets or sets the image tags.
/// </summary>
@ -467,6 +433,26 @@ namespace MediaBrowser.Model.Dto
[ProtoMember(69)]
public string MediaType { get; set; }
/// <summary>
/// Gets a value indicating whether this instance can resume.
/// </summary>
/// <value><c>true</c> if this instance can resume; otherwise, <c>false</c>.</value>
[IgnoreDataMember]
public bool CanResume
{
get { return UserData != null && UserData.PlaybackPositionTicks > 0; }
}
/// <summary>
/// Gets the resume position ticks.
/// </summary>
/// <value>The resume position ticks.</value>
[IgnoreDataMember]
public long ResumePositionTicks
{
get { return UserData == null ? 0 : UserData.PlaybackPositionTicks; }
}
/// <summary>
/// Gets the backdrop count.
/// </summary>
@ -597,12 +583,26 @@ namespace MediaBrowser.Model.Dto
get { return string.Equals(MediaType, Entities.MediaType.Game, StringComparison.OrdinalIgnoreCase); }
}
/// <summary>
/// Gets a value indicating whether this instance is person.
/// </summary>
/// <value><c>true</c> if this instance is person; otherwise, <c>false</c>.</value>
[IgnoreDataMember]
public bool IsPerson
{
get { return string.Equals(Type, "Person", StringComparison.OrdinalIgnoreCase); }
}
/// <summary>
/// Gets a value indicating whether this instance is root.
/// </summary>
/// <value><c>true</c> if this instance is root; otherwise, <c>false</c>.</value>
[IgnoreDataMember]
public bool IsRoot
{
get { return string.Equals(Type, "AggregateFolder", StringComparison.OrdinalIgnoreCase); }
}
/// <summary>
/// Occurs when [property changed].
/// </summary>

3
MediaBrowser.Server.Implementations/Sorting/AlbumArtistComparer.cs
Unescape View File

@ -1,9 +1,8 @@
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Sorting;
using MediaBrowser.Model.Dto;
using System;
using MediaBrowser.Model.Querying;
using System;
namespace MediaBrowser.Server.Implementations.Sorting
{

3
MediaBrowser.Server.Implementations/Sorting/AlbumComparer.cs
Unescape View File

@ -1,9 +1,8 @@
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Sorting;
using MediaBrowser.Model.Dto;
using System;
using MediaBrowser.Model.Querying;
using System;
namespace MediaBrowser.Server.Implementations.Sorting
{

3
MediaBrowser.Server.Implementations/Sorting/ArtistComparer.cs
Unescape View File

@ -1,9 +1,8 @@
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Sorting;
using MediaBrowser.Model.Dto;
using System;
using MediaBrowser.Model.Querying;
using System;
namespace MediaBrowser.Server.Implementations.Sorting
{

1
MediaBrowser.Server.Implementations/Sorting/CommunityRatingComparer.cs
Unescape View File

@ -1,6 +1,5 @@
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Sorting;
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Querying;
namespace MediaBrowser.Server.Implementations.Sorting

3
MediaBrowser.Server.Implementations/Sorting/DateCreatedComparer.cs
Unescape View File

@ -1,8 +1,7 @@
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Sorting;
using MediaBrowser.Model.Dto;
using System;
using MediaBrowser.Model.Querying;
using System;
namespace MediaBrowser.Server.Implementations.Sorting
{

3
MediaBrowser.Server.Implementations/Sorting/DatePlayedComparer.cs
Unescape View File

@ -1,8 +1,7 @@
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Sorting;
using MediaBrowser.Model.Dto;
using System;
using MediaBrowser.Model.Querying;
using System;
namespace MediaBrowser.Server.Implementations.Sorting
{

3
MediaBrowser.Server.Implementations/Sorting/PremiereDateComparer.cs
Unescape View File

@ -1,8 +1,7 @@
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Sorting;
using MediaBrowser.Model.Dto;
using System;
using MediaBrowser.Model.Querying;
using System;
namespace MediaBrowser.Server.Implementations.Sorting
{

1
MediaBrowser.Server.Implementations/Sorting/ProductionYearComparer.cs
Unescape View File

@ -1,6 +1,5 @@
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Sorting;
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Querying;
namespace MediaBrowser.Server.Implementations.Sorting

3
MediaBrowser.Server.Implementations/Sorting/RandomComparer.cs
Unescape View File

@ -1,8 +1,7 @@
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Sorting;
using MediaBrowser.Model.Dto;
using System;
using MediaBrowser.Model.Querying;
using System;
namespace MediaBrowser.Server.Implementations.Sorting
{

1
MediaBrowser.Server.Implementations/Sorting/RuntimeComparer.cs
Unescape View File

@ -1,6 +1,5 @@
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Sorting;
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Querying;
namespace MediaBrowser.Server.Implementations.Sorting

3
MediaBrowser.Server.Implementations/Sorting/SortNameComparer.cs
Unescape View File

@ -1,8 +1,7 @@
using MediaBrowser.Controller.Entities;
using System;
using MediaBrowser.Controller.Sorting;
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Querying;
using System;
namespace MediaBrowser.Server.Implementations.Sorting
{

Write Preview
Loading…
Cancel
Save