alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-29 11:58:27 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

merging with master to clear merge conflict

Browse Source
This commit is contained in:
Phallacy
2019-02-20 00:46:13 -08:00
parent 6bbb968b57 6c6e9ca9f2
commit a0d31a49a0
143 changed files with 3162 additions and 3215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,20 +7,6 @@ namespace MediaBrowser.Model.Configuration
/// </summary>
public class BaseApplicationConfiguration
{
// TODO: @bond Remove?
/// <summary>
/// Gets or sets a value indicating whether [enable debug level logging].
/// </summary>
/// <value><c>true</c> if [enable debug level logging]; otherwise, <c>false</c>.</value>
public bool EnableDebugLevelLogging { get; set; }
/// <summary>
/// Enable automatically and silently updating of the application
/// </summary>
/// <value><c>true</c> if [enable auto update]; otherwise, <c>false</c>.</value>
public bool EnableAutoUpdate { get; set; }
// TODO: @bond Remove?
/// <summary>
/// The number of days we should retain log files
/// </summary>
@@ -44,7 +30,6 @@ namespace MediaBrowser.Model.Configuration
/// </summary>
public BaseApplicationConfiguration()
{
EnableAutoUpdate = true;
LogFileRetentionDays = 3;
}
}

2
MediaBrowser.Model/Dlna/StreamBuilder.cs
View File

@@ -297,7 +297,7 @@ namespace MediaBrowser.Model.Dlna
int? inputAudioChannels = audioStream?.Channels;
int? inputAudioBitrate = audioStream?.BitDepth;
int? inputAudioSampleRate = audioStream?.SampleRate;
int? inputAudioBitDepth = audioStream.BitDepth;
int? inputAudioBitDepth = audioStream?.BitDepth;
if (directPlayMethods.Count() > 0)
{

2
MediaBrowser.Model/IO/IFileSystem.cs
View File

@@ -113,8 +113,6 @@ namespace MediaBrowser.Model.IO
Stream GetFileStream(string path, FileOpenMode mode, FileAccessMode access, FileShareMode share,
FileOpenOptions fileOpenOptions);
string DefaultDirectory { get; }
/// <summary>
/// Swaps the files.
/// </summary>

8
MediaBrowser.Model/Serialization/IJsonSerializer.cs
View File

@@ -14,6 +14,14 @@ namespace MediaBrowser.Model.Serialization
/// <exception cref="ArgumentNullException">obj</exception>
void SerializeToStream(object obj, Stream stream);
/// <summary>
/// Serializes to stream.
/// </summary>
/// <param name="obj">The obj.</param>
/// <param name="stream">The stream.</param>
/// <exception cref="ArgumentNullException">obj</exception>
void SerializeToStream<T>(T obj, Stream stream);
/// <summary>
/// Serializes to file.
/// </summary>

6
MediaBrowser.Model/System/PublicSystemInfo.cs
View File

@@ -24,12 +24,12 @@ namespace MediaBrowser.Model.System
/// Gets or sets the server version.
/// </summary>
/// <value>The version.</value>
public string Version { get; set; }
public string Version { get; set; }
/// <summary>
/// Gets or sets the operating sytem.
/// Gets or sets the operating system.
/// </summary>
/// <value>The operating sytem.</value>
/// <value>The operating system.</value>
public string OperatingSystem { get; set; }
/// <summary>

9
MediaBrowser.Model/System/SystemInfo.cs
View File

@@ -1,3 +1,4 @@
using System;
using System.Runtime.InteropServices;
using MediaBrowser.Model.Updates;
@@ -59,12 +60,6 @@ namespace MediaBrowser.Model.System
/// <value><c>true</c> if this instance can self restart; otherwise, <c>false</c>.</value>
public bool CanSelfRestart { get; set; }
/// <summary>
/// Gets or sets a value indicating whether this instance can self update.
/// </summary>
/// <value><c>true</c> if this instance can self update; otherwise, <c>false</c>.</value>
public bool CanSelfUpdate { get; set; }
public bool CanLaunchWebBrowser { get; set; }
/// <summary>
@@ -136,7 +131,7 @@ namespace MediaBrowser.Model.System
/// </summary>
public SystemInfo()
{
CompletedInstallations = new InstallationInfo[] { };
CompletedInstallations = Array.Empty<InstallationInfo>();
}
}
}