diff options
| author | Anthony Lavado <anthony@lavado.ca> | 2020-11-08 10:26:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-08 10:26:20 -0500 |
| commit | 79719780812ee3d00b0dcf2e0d6e4659964e151d (patch) | |
| tree | 75a5e225c85cf99070dbf8a1e1bf38d2831f14ac /MediaBrowser.Model | |
| parent | 96dcd9c87e2eb4b14004368856949e9fde2db261 (diff) | |
| parent | 2229ca38aca0d3007473a52c9560cec0bac8ac05 (diff) | |
Merge pull request #3683 from nyanmisaka/fonts
Allows to provide multiple fallback fonts for client to render subtitles
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/Configuration/EncodingOptions.cs | 5 | ||||
| -rw-r--r-- | MediaBrowser.Model/Subtitles/FontFile.cs | 34 |
2 files changed, 39 insertions, 0 deletions
diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs index 2cd637c5b0..c348256677 100644 --- a/MediaBrowser.Model/Configuration/EncodingOptions.cs +++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs @@ -9,6 +9,10 @@ namespace MediaBrowser.Model.Configuration public string TranscodingTempPath { get; set; } + public string FallbackFontPath { get; set; } + + public bool EnableFallbackFont { get; set; } + public double DownMixAudioBoost { get; set; } public int MaxMuxingQueueSize { get; set; } @@ -69,6 +73,7 @@ namespace MediaBrowser.Model.Configuration public EncodingOptions() { + EnableFallbackFont = false; DownMixAudioBoost = 2; MaxMuxingQueueSize = 2048; EnableThrottling = false; diff --git a/MediaBrowser.Model/Subtitles/FontFile.cs b/MediaBrowser.Model/Subtitles/FontFile.cs new file mode 100644 index 0000000000..115c492957 --- /dev/null +++ b/MediaBrowser.Model/Subtitles/FontFile.cs @@ -0,0 +1,34 @@ +using System; + +namespace MediaBrowser.Model.Subtitles +{ + /// <summary> + /// Class FontFile. + /// </summary> + public class FontFile + { + /// <summary> + /// Gets or sets the name. + /// </summary> + /// <value>The name.</value> + public string? Name { get; set; } + + /// <summary> + /// Gets or sets the size. + /// </summary> + /// <value>The size.</value> + public long Size { get; set; } + + /// <summary> + /// Gets or sets the date created. + /// </summary> + /// <value>The date created.</value> + public DateTime DateCreated { get; set; } + + /// <summary> + /// Gets or sets the date modified. + /// </summary> + /// <value>The date modified.</value> + public DateTime DateModified { get; set; } + } +} |
