Merge remote-tracking branch 'origin/main' into feat/142-trakt-lists

# Conflicts:
#	ErsatzTV.Tests/Controllers/ApiControllerSecurityTests.cs
#	web/src/App.tsx
#	web/src/screens/SettingsScreen.tsx

ErsatzTV.Core/Api/FFmpegProfiles/FFmpegFullProfileResponseModel.cs

@@ -1,4 +1,5 @@
-using ErsatzTV.Core.Domain;
+#nullable enable
+using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.FFmpeg;
 
 namespace ErsatzTV.Core.Api.FFmpegProfiles;
@@ -7,13 +8,17 @@ public record FFmpegFullProfileResponseModel(
     int Id,
     string Name,
     int ThreadCount,
+    bool NormalizeAudio,
+    bool NormalizeVideo,
     HardwareAccelerationKind HardwareAcceleration,
     string VaapiDisplay,
     VaapiDriver VaapiDriver,
     string VaapiDevice,
     int? QsvExtraHardwareFrames,
+    int ResolutionId,
     string Resolution,
     ScalingBehavior ScalingBehavior,
+    FilterMode PadMode,
     FFmpegProfileVideoFormat VideoFormat,
     string VideoProfile,
     string VideoPreset,
@@ -26,7 +31,9 @@ public record FFmpegFullProfileResponseModel(
     int AudioBitrate,
     int AudioBufferSize,
     NormalizeLoudnessMode NormalizeLoudnessMode,
+    double? TargetLoudness,
     int AudioChannels,
     int AudioSampleRate,
     bool NormalizeFramerate,
-    bool? DeinterlaceVideo);
+    bool NormalizeColors,
+    bool DeinterlaceVideo);

ErsatzTV.Core/Api/Filler/FillerPresetFullResponseModel.cs

@@ -0,0 +1,23 @@
+#nullable enable
+using ErsatzTV.Core.Domain;
+using ErsatzTV.Core.Domain.Filler;
+
+namespace ErsatzTV.Core.Api.Filler;
+
+public record FillerPresetFullResponseModel(
+    int Id,
+    string Name,
+    FillerKind FillerKind,
+    FillerMode FillerMode,
+    TimeSpan? Duration,
+    int? Count,
+    int? PadToNearestMinute,
+    bool AllowWatermarks,
+    CollectionType CollectionType,
+    int? CollectionId,
+    int? MediaItemId,
+    int? MultiCollectionId,
+    int? SmartCollectionId,
+    int? PlaylistId,
+    string? Expression,
+    bool UseChaptersAsMediaItems);

ErsatzTV.Core/Api/Watermarks/WatermarkFullResponseModel.cs

@@ -0,0 +1,24 @@
+#nullable enable
+using ErsatzTV.Core.Domain;
+using ErsatzTV.FFmpeg.State;
+
+namespace ErsatzTV.Core.Api.Watermarks;
+
+public record WatermarkFullResponseModel(
+    int Id,
+    string Name,
+    ChannelWatermarkMode Mode,
+    ChannelWatermarkImageSource ImageSource,
+    string? Image,
+    string? ImageContentType,
+    WatermarkLocation Location,
+    WatermarkSize Size,
+    double Width,
+    double HorizontalMargin,
+    double VerticalMargin,
+    int FrequencyMinutes,
+    int DurationSeconds,
+    int Opacity,
+    string? OpacityExpression,
+    int ZIndex,
+    bool PlaceWithinSourceContent);