From 6744e712d3a4fd6f800e5499c90b247787e48cb6 Mon Sep 17 00:00:00 2001
From: nicknsy <20588554+nicknsy@users.noreply.github.com>
Date: Sat, 25 Feb 2023 15:59:46 -0800
Subject: Use config values

---
 MediaBrowser.Model/Configuration/ServerConfiguration.cs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'MediaBrowser.Model/Configuration/ServerConfiguration.cs')

diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 78a310f0b..097eff295 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -264,5 +264,7 @@ namespace MediaBrowser.Model.Configuration
         /// </summary>
         /// <value>The limit for parallel image encoding.</value>
         public int ParallelImageEncodingLimit { get; set; }
+
+        public TrickplayOptions TrickplayOptions { get; set; } = new TrickplayOptions();
     }
 }
-- 
cgit v1.2.3


From fc619337481e3bb0f686aee06d9c5630926baaef Mon Sep 17 00:00:00 2001
From: Nick <20588554+nicknsy@users.noreply.github.com>
Date: Mon, 26 Jun 2023 22:04:39 -0700
Subject: Minor code changes

---
 Emby.Server.Implementations/Dto/DtoService.cs           | 2 +-
 MediaBrowser.Model/Configuration/ServerConfiguration.cs | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'MediaBrowser.Model/Configuration/ServerConfiguration.cs')

diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs
index 933b95df0..19ae39662 100644
--- a/Emby.Server.Implementations/Dto/DtoService.cs
+++ b/Emby.Server.Implementations/Dto/DtoService.cs
@@ -1064,7 +1064,7 @@ namespace Emby.Server.Implementations.Dto
 
                 if (options.ContainsField(ItemFields.Trickplay))
                 {
-                    var manifest = _trickplayManager.GetTrickplayManifest(item).ConfigureAwait(false).GetAwaiter().GetResult();
+                    var manifest = _trickplayManager.GetTrickplayManifest(item).GetAwaiter().GetResult();
 
                     // To stay consistent with other fields, this must go from a Guid to a non-dashed string.
                     // This does not seem to occur automatically to dictionaries like it does with other Guid fields.
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 097eff295..18f107503 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -265,6 +265,10 @@ namespace MediaBrowser.Model.Configuration
         /// <value>The limit for parallel image encoding.</value>
         public int ParallelImageEncodingLimit { get; set; }
 
+        /// <summary>
+        /// Gets or sets the trickplay options.
+        /// </summary>
+        /// <value>The trickplay options.</value>
         public TrickplayOptions TrickplayOptions { get; set; } = new TrickplayOptions();
     }
 }
-- 
cgit v1.2.3