alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-27 04:22:08 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge pull request #1 from jellyfin/master

Browse Source 
Pull latest to my fork
This commit is contained in:
Peter Maar
2020-03-19 22:02:08 -04:00
committed by GitHub
parent 818695a01e af5d3e8eae
commit adbf375efe
867 changed files with 6291 additions and 5054 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Model/Configuration/AccessSchedule.cs
View File

@@ -1,3 +1,5 @@
#pragma warning disable CS1591
namespace MediaBrowser.Model.Configuration
{
public class AccessSchedule
@@ -7,11 +9,13 @@ namespace MediaBrowser.Model.Configuration
/// </summary>
/// <value>The day of week.</value>
public DynamicDayOfWeek DayOfWeek { get; set; }
/// <summary>
/// Gets or sets the start hour.
/// </summary>
/// <value>The start hour.</value>
public double StartHour { get; set; }
/// <summary>
/// Gets or sets the end hour.
/// </summary>

21
MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
View File

@@ -1,3 +1,6 @@
using System;
using System.Xml.Serialization;
namespace MediaBrowser.Model.Configuration
{
/// <summary>
@@ -25,6 +28,24 @@ namespace MediaBrowser.Model.Configuration
/// <value>The cache path.</value>
public string CachePath { get; set; }
/// <summary>
/// Last known version that was ran using the configuration.
/// </summary>
/// <value>The version from previous run.</value>
[XmlIgnore]
public Version PreviousVersion { get; set; }
/// <summary>
/// Stringified PreviousVersion to be stored/loaded,
/// because System.Version itself isn't xml-serializable
/// </summary>
/// <value>String value of PreviousVersion</value>
public string PreviousVersionStr
{
get => PreviousVersion?.ToString();
set => PreviousVersion = Version.Parse(value);
}
/// <summary>
/// Initializes a new instance of the <see cref="BaseApplicationConfiguration" /> class.
/// </summary>

2
MediaBrowser.Model/Configuration/DynamicDayOfWeek.cs
View File

@@ -1,3 +1,5 @@
#pragma warning disable CS1591
namespace MediaBrowser.Model.Configuration
{
public enum DynamicDayOfWeek

10
MediaBrowser.Model/Configuration/EncodingOptions.cs
View File

@@ -1,3 +1,5 @@
#pragma warning disable CS1591
namespace MediaBrowser.Model.Configuration
{
public class EncodingOptions
@@ -8,12 +10,14 @@ namespace MediaBrowser.Model.Configuration
public bool EnableThrottling { get; set; }
public int ThrottleDelaySeconds { get; set; }
public string HardwareAccelerationType { get; set; }
/// <summary>
/// FFmpeg path as set by the user via the UI
/// FFmpeg path as set by the user via the UI.
/// </summary>
public string EncoderAppPath { get; set; }
/// <summary>
/// The current FFmpeg path being used by the system and displayed on the transcode page
/// The current FFmpeg path being used by the system and displayed on the transcode page.
/// </summary>
public string EncoderAppPathDisplay { get; set; }
public string VaapiDevice { get; set; }
@@ -29,7 +33,7 @@ namespace MediaBrowser.Model.Configuration
public EncodingOptions()
{
DownMixAudioBoost = 2;
EnableThrottling = true;
EnableThrottling = false;
ThrottleDelaySeconds = 180;
EncodingThreadCount = -1;
// This is a DRM device that is almost guaranteed to be there on every intel platform, plus it's the default one in ffmpeg if you don't specify anything

3
MediaBrowser.Model/Configuration/ImageOption.cs
View File

@@ -1,3 +1,5 @@
#pragma warning disable CS1591
using MediaBrowser.Model.Entities;
namespace MediaBrowser.Model.Configuration
@@ -9,6 +11,7 @@ namespace MediaBrowser.Model.Configuration
/// </summary>
/// <value>The type.</value>
public ImageType Type { get; set; }
/// <summary>
/// Gets or sets the limit.
/// </summary>

2
MediaBrowser.Model/Configuration/ImageSavingConvention.cs
View File

@@ -1,3 +1,5 @@
#pragma warning disable CS1591
namespace MediaBrowser.Model.Configuration
{
public enum ImageSavingConvention

3
MediaBrowser.Model/Configuration/LibraryOptions.cs
View File

@@ -1,3 +1,5 @@
#pragma warning disable CS1591
using System;
using System.Collections.Generic;
using MediaBrowser.Model.Entities;
@@ -18,6 +20,7 @@ namespace MediaBrowser.Model.Configuration
public bool ImportMissingEpisodes { get; set; }
public bool EnableAutomaticSeriesGrouping { get; set; }
public bool EnableEmbeddedTitles { get; set; }
public bool EnableEmbeddedEpisodeInfos { get; set; }
public int AutomaticRefreshIntervalDays { get; set; }

2
MediaBrowser.Model/Configuration/MetadataConfiguration.cs
View File

@@ -1,3 +1,5 @@
#pragma warning disable CS1591
namespace MediaBrowser.Model.Configuration
{
public class MetadataConfiguration

2
MediaBrowser.Model/Configuration/MetadataOptions.cs
View File

@@ -1,3 +1,5 @@
#pragma warning disable CS1591
using System;
namespace MediaBrowser.Model.Configuration

2
MediaBrowser.Model/Configuration/MetadataPlugin.cs
View File

@@ -1,3 +1,5 @@
#pragma warning disable CS1591
namespace MediaBrowser.Model.Configuration
{
public class MetadataPlugin

2
MediaBrowser.Model/Configuration/MetadataPluginSummary.cs
View File

@@ -1,3 +1,5 @@
#pragma warning disable CS1591
using System;
using MediaBrowser.Model.Entities;

2
MediaBrowser.Model/Configuration/MetadataPluginType.cs
View File

@@ -1,3 +1,5 @@
#pragma warning disable CS1591
namespace MediaBrowser.Model.Configuration
{
/// <summary>

7
MediaBrowser.Model/Configuration/ServerConfiguration.cs
View File

@@ -1,3 +1,5 @@
#pragma warning disable CS1591
using System;
using MediaBrowser.Model.Dto;
@@ -162,6 +164,7 @@ namespace MediaBrowser.Model.Configuration
public bool SkipDeserializationForBasicTypes { get; set; }
public string ServerName { get; set; }
public string BaseUrl
{
get => _baseUrl;
@@ -234,7 +237,7 @@ namespace MediaBrowser.Model.Configuration
CodecsUsed = Array.Empty<string>();
PathSubstitutions = Array.Empty<PathSubstitution>();
IgnoreVirtualInterfaces = false;
EnableSimpleArtistDetection = true;
EnableSimpleArtistDetection = false;
DisplaySpecialsWithinSeasons = true;
EnableExternalContentInSuggestions = true;
@@ -244,7 +247,7 @@ namespace MediaBrowser.Model.Configuration
PublicHttpsPort = DefaultHttpsPort;
HttpServerPortNumber = DefaultHttpPort;
HttpsPortNumber = DefaultHttpsPort;
EnableHttps = true;
EnableHttps = false;
EnableDashboardResponseCaching = true;
EnableCaseSensitiveItemIds = true;

2
MediaBrowser.Model/Configuration/SubtitlePlaybackMode.cs
View File

@@ -1,3 +1,5 @@
#pragma warning disable CS1591
namespace MediaBrowser.Model.Configuration
{
public enum SubtitlePlaybackMode

2
MediaBrowser.Model/Configuration/UnratedItem.cs
View File

@@ -1,3 +1,5 @@
#pragma warning disable CS1591
namespace MediaBrowser.Model.Configuration
{
public enum UnratedItem

2
MediaBrowser.Model/Configuration/UserConfiguration.cs
View File

@@ -1,3 +1,5 @@
#pragma warning disable CS1591
using System;
namespace MediaBrowser.Model.Configuration

2
MediaBrowser.Model/Configuration/XbmcMetadataOptions.cs
View File

@@ -1,3 +1,5 @@
#pragma warning disable CS1591
namespace MediaBrowser.Model.Configuration
{
public class XbmcMetadataOptions