override languages and subtitles on schedule items (#753)

ErsatzTV.Application/ProgramSchedules/Commands/AddProgramScheduleItem.cs

@@ -24,4 +24,8 @@ public record AddProgramScheduleItem(
     int? PostRollFillerId,
     int? TailFillerId,
     int? FallbackFillerId,
-    int? WatermarkId) : IRequest<Either<BaseError, ProgramScheduleItemViewModel>>, IProgramScheduleItemRequest;
+    int? WatermarkId,
+    string PreferredAudioLanguageCode,
+    string PreferredSubtitleLanguageCode,
+    ChannelSubtitleMode? SubtitleMode) : IRequest<Either<BaseError, ProgramScheduleItemViewModel>>,
+    IProgramScheduleItemRequest;

ErsatzTV.Application/ProgramSchedules/Commands/IProgramScheduleItemRequest.cs

@@ -23,4 +23,7 @@ public interface IProgramScheduleItemRequest
     int? TailFillerId { get; }
     int? FallbackFillerId { get; }
     int? WatermarkId { get; }
+    string PreferredAudioLanguageCode { get; }
+    string PreferredSubtitleLanguageCode { get; }
+    ChannelSubtitleMode? SubtitleMode { get; }
 }

ErsatzTV.Application/ProgramSchedules/Commands/ProgramScheduleItemCommandBase.cs

@@ -178,7 +178,10 @@ public abstract class ProgramScheduleItemCommandBase
                 PostRollFillerId = item.PostRollFillerId,
                 TailFillerId = item.TailFillerId,
                 FallbackFillerId = item.FallbackFillerId,
-                WatermarkId = item.WatermarkId
+                WatermarkId = item.WatermarkId,
+                PreferredAudioLanguageCode = item.PreferredAudioLanguageCode,
+                PreferredSubtitleLanguageCode = item.PreferredSubtitleLanguageCode,
+                SubtitleMode = item.SubtitleMode
             },
             PlayoutMode.One => new ProgramScheduleItemOne
             {
@@ -198,7 +201,10 @@ public abstract class ProgramScheduleItemCommandBase
                 PostRollFillerId = item.PostRollFillerId,
                 TailFillerId = item.TailFillerId,
                 FallbackFillerId = item.FallbackFillerId,
-                WatermarkId = item.WatermarkId
+                WatermarkId = item.WatermarkId,
+                PreferredAudioLanguageCode = item.PreferredAudioLanguageCode,
+                PreferredSubtitleLanguageCode = item.PreferredSubtitleLanguageCode,
+                SubtitleMode = item.SubtitleMode
             },
             PlayoutMode.Multiple => new ProgramScheduleItemMultiple
             {
@@ -219,7 +225,10 @@ public abstract class ProgramScheduleItemCommandBase
                 PostRollFillerId = item.PostRollFillerId,
                 TailFillerId = item.TailFillerId,
                 FallbackFillerId = item.FallbackFillerId,
-                WatermarkId = item.WatermarkId
+                WatermarkId = item.WatermarkId,
+                PreferredAudioLanguageCode = item.PreferredAudioLanguageCode,
+                PreferredSubtitleLanguageCode = item.PreferredSubtitleLanguageCode,
+                SubtitleMode = item.SubtitleMode
             },
             PlayoutMode.Duration => new ProgramScheduleItemDuration
             {
@@ -241,7 +250,10 @@ public abstract class ProgramScheduleItemCommandBase
                 PostRollFillerId = item.PostRollFillerId,
                 TailFillerId = item.TailFillerId,
                 FallbackFillerId = item.FallbackFillerId,
-                WatermarkId = item.WatermarkId
+                WatermarkId = item.WatermarkId,
+                PreferredAudioLanguageCode = item.PreferredAudioLanguageCode,
+                PreferredSubtitleLanguageCode = item.PreferredSubtitleLanguageCode,
+                SubtitleMode = item.SubtitleMode
             },
             _ => throw new NotSupportedException($"Unsupported playout mode {item.PlayoutMode}")
         };

ErsatzTV.Application/ProgramSchedules/Commands/ReplaceProgramScheduleItems.cs

@@ -24,7 +24,10 @@ public record ReplaceProgramScheduleItem(
     int? PostRollFillerId,
     int? TailFillerId,
     int? FallbackFillerId,
-    int? WatermarkId) : IProgramScheduleItemRequest;
+    int? WatermarkId,
+    string PreferredAudioLanguageCode,
+    string PreferredSubtitleLanguageCode,
+    ChannelSubtitleMode? SubtitleMode) : IProgramScheduleItemRequest;
 
 public record ReplaceProgramScheduleItems
     (int ProgramScheduleId, List<ReplaceProgramScheduleItem> Items) : IRequest<

ErsatzTV.Application/ProgramSchedules/Mapper.cs

@@ -60,7 +60,10 @@ internal static class Mapper
                         : null,
                     duration.Watermark != null
                         ? Watermarks.Mapper.ProjectToViewModel(duration.Watermark)
-                        : null),
+                        : null,
+                    duration.PreferredAudioLanguageCode,
+                    duration.PreferredSubtitleLanguageCode,
+                    duration.SubtitleMode),
             ProgramScheduleItemFlood flood =>
                 new ProgramScheduleItemFloodViewModel(
                     flood.Id,
@@ -104,7 +107,10 @@ internal static class Mapper
                         : null,
                     flood.Watermark != null
                         ? Watermarks.Mapper.ProjectToViewModel(flood.Watermark)
-                        : null),
+                        : null,
+                    flood.PreferredAudioLanguageCode,
+                    flood.PreferredSubtitleLanguageCode,
+                    flood.SubtitleMode),
             ProgramScheduleItemMultiple multiple =>
                 new ProgramScheduleItemMultipleViewModel(
                     multiple.Id,
@@ -149,7 +155,10 @@ internal static class Mapper
                         : null,
                     multiple.Watermark != null
                         ? Watermarks.Mapper.ProjectToViewModel(multiple.Watermark)
-                        : null),
+                        : null,
+                    multiple.PreferredAudioLanguageCode,
+                    multiple.PreferredSubtitleLanguageCode,
+                    multiple.SubtitleMode),
             ProgramScheduleItemOne one =>
                 new ProgramScheduleItemOneViewModel(
                     one.Id,
@@ -193,7 +202,10 @@ internal static class Mapper
                         : null,
                     one.Watermark != null
                         ? Watermarks.Mapper.ProjectToViewModel(one.Watermark)
-                        : null),
+                        : null,
+                    one.PreferredAudioLanguageCode,
+                    one.PreferredSubtitleLanguageCode,
+                    one.SubtitleMode),
             _ => throw new NotSupportedException(
                 $"Unsupported program schedule item type {programScheduleItem.GetType().Name}")
         };

ErsatzTV.Application/ProgramSchedules/ProgramScheduleItemDurationViewModel.cs

@@ -28,7 +28,10 @@ public record ProgramScheduleItemDurationViewModel : ProgramScheduleItemViewMode
         FillerPresetViewModel postRollFiller,
         FillerPresetViewModel tailFiller,
         FillerPresetViewModel fallbackFiller,
-        WatermarkViewModel watermark) : base(
+        WatermarkViewModel watermark,
+        string preferredAudioLanguageCode,
+        string preferredSubtitleLanguageCode,
+        ChannelSubtitleMode? subtitleMode) : base(
         id,
         index,
         startType,
@@ -47,7 +50,10 @@ public record ProgramScheduleItemDurationViewModel : ProgramScheduleItemViewMode
         postRollFiller,
         tailFiller,
         fallbackFiller,
-        watermark)
+        watermark,
+        preferredAudioLanguageCode,
+        preferredSubtitleLanguageCode,
+        subtitleMode)
     {
         PlayoutDuration = playoutDuration;
         TailMode = tailMode;

ErsatzTV.Application/ProgramSchedules/ProgramScheduleItemFloodViewModel.cs

@@ -26,7 +26,10 @@ public record ProgramScheduleItemFloodViewModel : ProgramScheduleItemViewModel
         FillerPresetViewModel postRollFiller,
         FillerPresetViewModel tailFiller,
         FillerPresetViewModel fallbackFiller,
-        WatermarkViewModel watermark) : base(
+        WatermarkViewModel watermark,
+        string preferredAudioLanguageCode,
+        string preferredSubtitleLanguageCode,
+        ChannelSubtitleMode? subtitleMode) : base(
         id,
         index,
         startType,
@@ -45,7 +48,10 @@ public record ProgramScheduleItemFloodViewModel : ProgramScheduleItemViewModel
         postRollFiller,
         tailFiller,
         fallbackFiller,
-        watermark)
+        watermark,
+        preferredAudioLanguageCode,
+        preferredSubtitleLanguageCode,
+        subtitleMode)
     {
     }
 }

ErsatzTV.Application/ProgramSchedules/ProgramScheduleItemMultipleViewModel.cs

@@ -27,7 +27,10 @@ public record ProgramScheduleItemMultipleViewModel : ProgramScheduleItemViewMode
         FillerPresetViewModel postRollFiller,
         FillerPresetViewModel tailFiller,
         FillerPresetViewModel fallbackFiller,
-        WatermarkViewModel watermark) : base(
+        WatermarkViewModel watermark,
+        string preferredAudioLanguageCode,
+        string preferredSubtitleLanguageCode,
+        ChannelSubtitleMode? subtitleMode) : base(
         id,
         index,
         startType,
@@ -46,7 +49,10 @@ public record ProgramScheduleItemMultipleViewModel : ProgramScheduleItemViewMode
         postRollFiller,
         tailFiller,
         fallbackFiller,
-        watermark) =>
+        watermark,
+        preferredAudioLanguageCode,
+        preferredSubtitleLanguageCode,
+        subtitleMode) =>
         Count = count;
 
     public int Count { get; }

ErsatzTV.Application/ProgramSchedules/ProgramScheduleItemOneViewModel.cs

@@ -26,7 +26,10 @@ public record ProgramScheduleItemOneViewModel : ProgramScheduleItemViewModel
         FillerPresetViewModel postRollFiller,
         FillerPresetViewModel tailFiller,
         FillerPresetViewModel fallbackFiller,
-        WatermarkViewModel watermark) : base(
+        WatermarkViewModel watermark,
+        string preferredAudioLanguageCode,
+        string preferredSubtitleLanguageCode,
+        ChannelSubtitleMode? subtitleMode) : base(
         id,
         index,
         startType,
@@ -45,7 +48,10 @@ public record ProgramScheduleItemOneViewModel : ProgramScheduleItemViewModel
         postRollFiller,
         tailFiller,
         fallbackFiller,
-        watermark)
+        watermark,
+        preferredAudioLanguageCode,
+        preferredSubtitleLanguageCode,
+        subtitleMode)
     {
     }
 }

ErsatzTV.Application/ProgramSchedules/ProgramScheduleItemViewModel.cs

@@ -25,7 +25,10 @@ public abstract record ProgramScheduleItemViewModel(
     FillerPresetViewModel PostRollFiller,
     FillerPresetViewModel TailFiller,
     FillerPresetViewModel FallbackFiller,
-    WatermarkViewModel Watermark)
+    WatermarkViewModel Watermark,
+    string PreferredAudioLanguageCode,
+    string PreferredSubtitleLanguageCode,
+    ChannelSubtitleMode? SubtitleMode)
 {
     public string Name => CollectionType switch
     {

ErsatzTV.Application/Streaming/Queries/GetPlayoutItemProcessByChannelNumberHandler.cs

@@ -163,6 +163,9 @@ public class GetPlayoutItemProcessByChannelNumberHandler : FFmpegProcessHandler<
                 videoPath,
                 audioPath,
                 subtitles,
+                playoutItemWithPath.PlayoutItem.PreferredAudioLanguageCode ?? channel.PreferredAudioLanguageCode,
+                playoutItemWithPath.PlayoutItem.PreferredSubtitleLanguageCode ?? channel.PreferredSubtitleLanguageCode,
+                playoutItemWithPath.PlayoutItem.SubtitleMode ?? channel.SubtitleMode,
                 playoutItemWithPath.PlayoutItem.StartOffset,
                 playoutItemWithPath.PlayoutItem.FinishOffset,
                 request.StartAtZero ? playoutItemWithPath.PlayoutItem.StartOffset : now,

ErsatzTV.Core.Tests/FFmpeg/TranscodingTests.cs

@@ -473,6 +473,9 @@ public class TranscodingTests
             file,
             file,
             subtitles,
+            string.Empty,
+            string.Empty,
+            subtitleMode,
             now,
             now + TimeSpan.FromSeconds(5),
             now,
@@ -550,16 +553,24 @@ public class TranscodingTests
 
     private class FakeStreamSelector : IFFmpegStreamSelector
     {
-        public Task<MediaStream> SelectVideoStream(Channel channel, MediaVersion version) =>
+        public Task<MediaStream> SelectVideoStream(MediaVersion version) =>
             version.Streams.First(s => s.MediaStreamKind == MediaStreamKind.Video).AsTask();
 
-        public Task<Option<MediaStream>> SelectAudioStream(Channel channel, MediaVersion version) =>
+        public Task<Option<MediaStream>> SelectAudioStream(
+            MediaVersion version,
+            StreamingMode streamingMode,
+            string channelNumber,
+            string preferredAudioLanguage) =>
             Optional(version.Streams.First(s => s.MediaStreamKind == MediaStreamKind.Audio)).AsTask();
 
         public Task<Option<Domain.Subtitle>> SelectSubtitleStream(
-            Channel channel,
             MediaVersion version,
-            List<Domain.Subtitle> subtitles) => subtitles.HeadOrNone().AsTask();
+            List<Domain.Subtitle> subtitles,
+            StreamingMode streamingMode,
+            string channelNumber,
+            string preferredSubtitleLanguage,
+            ChannelSubtitleMode subtitleMode) =>
+            subtitles.HeadOrNone().AsTask();
     }
 
     private static string ExecutableName(string baseName) =>

ErsatzTV.Core/Domain/ChannelSubtitleMode.cs

@@ -5,5 +5,4 @@ public enum ChannelSubtitleMode
     None = 0,
     Forced = 1,
     Default = 2,
-    Any = 3
-}
+    Any = 3}

ErsatzTV.Core/Domain/PlayoutItem.cs

@@ -22,7 +22,9 @@ public class PlayoutItem
     public string ChapterTitle { get; set; }
     public ChannelWatermark Watermark { get; set; }
     public int? WatermarkId { get; set; }
-
+    public string PreferredAudioLanguageCode { get; set; }
+    public string PreferredSubtitleLanguageCode { get; set; }
+    public ChannelSubtitleMode? SubtitleMode { get; set; }
     public DateTimeOffset StartOffset => new DateTimeOffset(Start, TimeSpan.Zero).ToLocalTime();
     public DateTimeOffset FinishOffset => new DateTimeOffset(Finish, TimeSpan.Zero).ToLocalTime();
 

ErsatzTV.Core/Domain/ProgramScheduleItem.cs

@@ -34,4 +34,7 @@ public abstract class ProgramScheduleItem
     public FillerPreset FallbackFiller { get; set; }
     public ChannelWatermark Watermark { get; set; }
     public int? WatermarkId { get; set; }
+    public string PreferredAudioLanguageCode { get; set; }
+    public string PreferredSubtitleLanguageCode { get; set; }
+    public ChannelSubtitleMode? SubtitleMode { get; set; }
 }

ErsatzTV.Core/FFmpeg/FFmpegLibraryProcessService.cs

@@ -41,6 +41,9 @@ public class FFmpegLibraryProcessService : IFFmpegProcessService
         string videoPath,
         string audioPath,
         List<Subtitle> subtitles,
+        string preferredAudioLanguage,
+        string preferredSubtitleLanguage,
+        ChannelSubtitleMode subtitleMode,
         DateTimeOffset start,
         DateTimeOffset finish,
         DateTimeOffset now,
@@ -55,10 +58,21 @@ public class FFmpegLibraryProcessService : IFFmpegProcessService
         long ptsOffset,
         Option<int> targetFramerate)
     {
-        MediaStream videoStream = await _ffmpegStreamSelector.SelectVideoStream(channel, videoVersion);
-        Option<MediaStream> maybeAudioStream = await _ffmpegStreamSelector.SelectAudioStream(channel, audioVersion);
+        MediaStream videoStream = await _ffmpegStreamSelector.SelectVideoStream(videoVersion);
+        Option<MediaStream> maybeAudioStream =
+            await _ffmpegStreamSelector.SelectAudioStream(
+                audioVersion,
+                channel.StreamingMode,
+                channel.Number,
+                preferredAudioLanguage);
         Option<Subtitle> maybeSubtitle =
-            await _ffmpegStreamSelector.SelectSubtitleStream(channel, videoVersion, subtitles);
+            await _ffmpegStreamSelector.SelectSubtitleStream(
+                videoVersion,
+                subtitles,
+                channel.StreamingMode,
+                channel.Number,
+                preferredSubtitleLanguage,
+                subtitleMode);
 
         FFmpegPlaybackSettings playbackSettings = _playbackSettingsCalculator.CalculateSettings(
             channel.StreamingMode,

ErsatzTV.Core/FFmpeg/FFmpegProcessService.cs

@@ -204,7 +204,7 @@ public class FFmpegProcessService
         {
             string outputFile = _tempFilePool.GetNextTempFile(TempFileCategory.SongBackground);
 
-            MediaStream videoStream = await _ffmpegStreamSelector.SelectVideoStream(channel, videoVersion);
+            MediaStream videoStream = await _ffmpegStreamSelector.SelectVideoStream(videoVersion);
 
             Option<ChannelWatermark> watermarkOverride =
                 videoVersion is FallbackMediaVersion or CoverArtMediaVersion

ErsatzTV.Core/FFmpeg/FFmpegStreamSelector.cs

@@ -21,26 +21,30 @@ public class FFmpegStreamSelector : IFFmpegStreamSelector
         _configElementRepository = configElementRepository;
     }
 
-    public Task<MediaStream> SelectVideoStream(Channel channel, MediaVersion version) =>
+    public Task<MediaStream> SelectVideoStream(MediaVersion version) =>
         version.Streams.First(s => s.MediaStreamKind == MediaStreamKind.Video).AsTask();
 
-    public async Task<Option<MediaStream>> SelectAudioStream(Channel channel, MediaVersion version)
+    public async Task<Option<MediaStream>> SelectAudioStream(
+        MediaVersion version,
+        StreamingMode streamingMode,
+        string channelNumber,
+        string preferredAudioLanguage)
     {
-        if (channel.StreamingMode == StreamingMode.HttpLiveStreamingDirect &&
-            string.IsNullOrWhiteSpace(channel.PreferredAudioLanguageCode))
+        if (streamingMode == StreamingMode.HttpLiveStreamingDirect &&
+            string.IsNullOrWhiteSpace(preferredAudioLanguage))
         {
             _logger.LogDebug(
                 "Channel {Number} is HLS Direct with no preferred audio language; using all audio streams",
-                channel.Number);
+                channelNumber);
             return None;
         }
 
         var audioStreams = version.Streams.Filter(s => s.MediaStreamKind == MediaStreamKind.Audio).ToList();
 
-        string language = (channel.PreferredAudioLanguageCode ?? string.Empty).ToLowerInvariant();
+        string language = (preferredAudioLanguage ?? string.Empty).ToLowerInvariant();
         if (string.IsNullOrWhiteSpace(language))
         {
-            _logger.LogDebug("Channel {Number} has no preferred audio language code", channel.Number);
+            _logger.LogDebug("Channel {Number} has no preferred audio language code", channelNumber);
             Option<string> maybeDefaultLanguage = await _configElementRepository.GetValue<string>(
                 ConfigElementKey.FFmpegPreferredLanguageCode);
             maybeDefaultLanguage.Match(
@@ -82,17 +86,20 @@ public class FFmpegStreamSelector : IFFmpegStreamSelector
     }
 
     public async Task<Option<Subtitle>> SelectSubtitleStream(
-        Channel channel,
         MediaVersion version,
-        List<Subtitle> subtitles)
+        List<Subtitle> subtitles,
+        StreamingMode streamingMode,
+        string channelNumber,
+        string preferredSubtitleLanguage,
+        ChannelSubtitleMode subtitleMode)
     {
-        if (channel.SubtitleMode == ChannelSubtitleMode.None)
+        if (subtitleMode == ChannelSubtitleMode.None)
         {
             return None;
         }
 
-        if (channel.StreamingMode == StreamingMode.HttpLiveStreamingDirect &&
-            string.IsNullOrWhiteSpace(channel.PreferredSubtitleLanguageCode))
+        if (streamingMode == StreamingMode.HttpLiveStreamingDirect &&
+            string.IsNullOrWhiteSpace(preferredSubtitleLanguage))
         {
             // _logger.LogDebug(
             //     "Channel {Number} is HLS Direct with no preferred subtitle language; using all subtitle streams",
@@ -100,10 +107,10 @@ public class FFmpegStreamSelector : IFFmpegStreamSelector
             return None;
         }
 
-        string language = (channel.PreferredSubtitleLanguageCode ?? string.Empty).ToLowerInvariant();
+        string language = (preferredSubtitleLanguage ?? string.Empty).ToLowerInvariant();
         if (string.IsNullOrWhiteSpace(language))
         {
-            _logger.LogDebug("Channel {Number} has no preferred subtitle language code", channel.Number);
+            _logger.LogDebug("Channel {Number} has no preferred subtitle language code", channelNumber);
         }
         else
         {
@@ -117,7 +124,7 @@ public class FFmpegStreamSelector : IFFmpegStreamSelector
 
         if (subtitles.Count > 0)
         {
-            switch (channel.SubtitleMode)
+            switch (subtitleMode)
             {
                 case ChannelSubtitleMode.Forced:
                     foreach (Subtitle subtitle in subtitles.OrderBy(s => s.StreamIndex).Find(s => s.Forced))
@@ -145,9 +152,9 @@ public class FFmpegStreamSelector : IFFmpegStreamSelector
 
         _logger.LogDebug(
             "Found no subtitles for channel {ChannelNumber} with mode {Mode} matching language {Language}",
-            channel.Number,
-            channel.SubtitleMode,
-            channel.PreferredSubtitleLanguageCode);
+            channelNumber,
+            subtitleMode,
+            preferredSubtitleLanguage);
 
         return None;
     }

ErsatzTV.Core/Interfaces/FFmpeg/IFFmpegProcessService.cs

@@ -18,6 +18,9 @@ public interface IFFmpegProcessService
         string videoPath,
         string audioPath,
         List<Subtitle> subtitles,
+        string preferredAudioLanguage,
+        string preferredSubtitleLanguage,
+        ChannelSubtitleMode subtitleMode,
         DateTimeOffset start,
         DateTimeOffset finish,
         DateTimeOffset now,

ErsatzTV.Core/Interfaces/FFmpeg/IFFmpegStreamSelector.cs

@@ -4,8 +4,19 @@ namespace ErsatzTV.Core.Interfaces.FFmpeg;
 
 public interface IFFmpegStreamSelector
 {
-    Task<MediaStream> SelectVideoStream(Channel channel, MediaVersion version);
-    Task<Option<MediaStream>> SelectAudioStream(Channel channel, MediaVersion version);
+    Task<MediaStream> SelectVideoStream(MediaVersion version);
 
-    Task<Option<Subtitle>> SelectSubtitleStream(Channel channel, MediaVersion version, List<Subtitle> subtitles);
+    Task<Option<MediaStream>> SelectAudioStream(
+        MediaVersion version,
+        StreamingMode streamingMode,
+        string channelNumber,
+        string preferredAudioLanguage);
+
+    Task<Option<Subtitle>> SelectSubtitleStream(
+        MediaVersion version,
+        List<Subtitle> subtitles,
+        StreamingMode streamingMode,
+        string channelNumber,
+        string preferredSubtitleLanguage,
+        ChannelSubtitleMode subtitleMode);
 }

ErsatzTV.Core/Scheduling/PlayoutModeSchedulerDuration.cs

@@ -73,7 +73,10 @@ public class PlayoutModeSchedulerDuration : PlayoutModeSchedulerBase<ProgramSche
                     ? FillerKind.Tail
                     : FillerKind.None,
                 CustomTitle = scheduleItem.CustomTitle,
-                WatermarkId = scheduleItem.WatermarkId
+                WatermarkId = scheduleItem.WatermarkId,
+                PreferredAudioLanguageCode = scheduleItem.PreferredAudioLanguageCode,
+                PreferredSubtitleLanguageCode = scheduleItem.PreferredSubtitleLanguageCode,
+                SubtitleMode = scheduleItem.SubtitleMode
             };
 
             durationUntil.Do(du => playoutItem.GuideFinish = du.UtcDateTime);

ErsatzTV.Core/Scheduling/PlayoutModeSchedulerFlood.cs

@@ -50,7 +50,10 @@ public class PlayoutModeSchedulerFlood : PlayoutModeSchedulerBase<ProgramSchedul
                 FillerKind = scheduleItem.GuideMode == GuideMode.Filler
                     ? FillerKind.Tail
                     : FillerKind.None,
-                WatermarkId = scheduleItem.WatermarkId
+                WatermarkId = scheduleItem.WatermarkId,
+                PreferredAudioLanguageCode = scheduleItem.PreferredAudioLanguageCode,
+                PreferredSubtitleLanguageCode = scheduleItem.PreferredSubtitleLanguageCode,
+                SubtitleMode = scheduleItem.SubtitleMode
             };
 
             DateTimeOffset peekScheduleItemStart =

ErsatzTV.Core/Scheduling/PlayoutModeSchedulerMultiple.cs

@@ -60,7 +60,10 @@ public class PlayoutModeSchedulerMultiple : PlayoutModeSchedulerBase<ProgramSche
                 FillerKind = scheduleItem.GuideMode == GuideMode.Filler
                     ? FillerKind.Tail
                     : FillerKind.None,
-                WatermarkId = scheduleItem.WatermarkId
+                WatermarkId = scheduleItem.WatermarkId,
+                PreferredAudioLanguageCode = scheduleItem.PreferredAudioLanguageCode,
+                PreferredSubtitleLanguageCode = scheduleItem.PreferredSubtitleLanguageCode,
+                SubtitleMode = scheduleItem.SubtitleMode
             };
 
             // LogScheduledItem(scheduleItem, mediaItem, itemStartTime);

ErsatzTV.Core/Scheduling/PlayoutModeSchedulerOne.cs

@@ -41,7 +41,10 @@ public class PlayoutModeSchedulerOne : PlayoutModeSchedulerBase<ProgramScheduleI
                 FillerKind = scheduleItem.GuideMode == GuideMode.Filler
                     ? FillerKind.Tail
                     : FillerKind.None,
-                WatermarkId = scheduleItem.WatermarkId
+                WatermarkId = scheduleItem.WatermarkId,
+                PreferredAudioLanguageCode = scheduleItem.PreferredAudioLanguageCode,
+                PreferredSubtitleLanguageCode = scheduleItem.PreferredSubtitleLanguageCode,
+                SubtitleMode = scheduleItem.SubtitleMode
             };
 
             DateTimeOffset itemEndTimeWithFiller = CalculateEndTimeWithFiller(

ErsatzTV.Infrastructure/Migrations/20220422195137_Add_ProgramScheduleItemLanguageCodes.cs

@@ -0,0 +1,75 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ErsatzTV.Infrastructure.Migrations
+{
+    public partial class Add_ProgramScheduleItemLanguageCodes : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "PreferredAudioLanguageCode",
+                table: "ProgramScheduleItem",
+                type: "TEXT",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "PreferredSubtitleLanguageCode",
+                table: "ProgramScheduleItem",
+                type: "TEXT",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "SubtitleMode",
+                table: "ProgramScheduleItem",
+                type: "INTEGER",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "PreferredAudioLanguageCode",
+                table: "PlayoutItem",
+                type: "TEXT",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "PreferredSubtitleLanguageCode",
+                table: "PlayoutItem",
+                type: "TEXT",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "SubtitleMode",
+                table: "PlayoutItem",
+                type: "INTEGER",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "PreferredAudioLanguageCode",
+                table: "ProgramScheduleItem");
+
+            migrationBuilder.DropColumn(
+                name: "PreferredSubtitleLanguageCode",
+                table: "ProgramScheduleItem");
+
+            migrationBuilder.DropColumn(
+                name: "SubtitleMode",
+                table: "ProgramScheduleItem");
+
+            migrationBuilder.DropColumn(
+                name: "PreferredAudioLanguageCode",
+                table: "PlayoutItem");
+
+            migrationBuilder.DropColumn(
+                name: "PreferredSubtitleLanguageCode",
+                table: "PlayoutItem");
+
+            migrationBuilder.DropColumn(
+                name: "SubtitleMode",
+                table: "PlayoutItem");
+        }
+    }
+}

ErsatzTV.Infrastructure/Migrations/TvContextModelSnapshot.cs

@@ -1374,9 +1374,18 @@ namespace ErsatzTV.Infrastructure.Migrations
                     b.Property<int>("PlayoutId")
                         .HasColumnType("INTEGER");
 
+                    b.Property<string>("PreferredAudioLanguageCode")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PreferredSubtitleLanguageCode")
+                        .HasColumnType("TEXT");
+
                     b.Property<DateTime>("Start")
                         .HasColumnType("TEXT");
 
+                    b.Property<int?>("SubtitleMode")
+                        .HasColumnType("INTEGER");
+
                     b.Property<int?>("WatermarkId")
                         .HasColumnType("INTEGER");
 
@@ -1550,6 +1559,12 @@ namespace ErsatzTV.Infrastructure.Migrations
                     b.Property<int?>("PreRollFillerId")
                         .HasColumnType("INTEGER");
 
+                    b.Property<string>("PreferredAudioLanguageCode")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("PreferredSubtitleLanguageCode")
+                        .HasColumnType("TEXT");
+
                     b.Property<int>("ProgramScheduleId")
                         .HasColumnType("INTEGER");
 
@@ -1559,6 +1574,9 @@ namespace ErsatzTV.Infrastructure.Migrations
                     b.Property<TimeSpan?>("StartTime")
                         .HasColumnType("TEXT");
 
+                    b.Property<int?>("SubtitleMode")
+                        .HasColumnType("INTEGER");
+
                     b.Property<int?>("TailFillerId")
                         .HasColumnType("INTEGER");
 

ErsatzTV/Pages/Artist.razor

@@ -238,7 +238,7 @@
         DialogResult result = await dialog.Result;
         if (!result.Cancelled && result.Data is ProgramScheduleViewModel schedule)
         {
-            await _mediator.Send(new AddProgramScheduleItem(schedule.Id, StartType.Dynamic, null, PlayoutMode.One, ProgramScheduleItemCollectionType.Artist, null, null, null, ArtistId, PlaybackOrder.Shuffle, null, null, TailMode.None, null, GuideMode.Normal, null, null, null, null, null, null), _cts.Token);
+            await _mediator.Send(new AddProgramScheduleItem(schedule.Id, StartType.Dynamic, null, PlayoutMode.One, ProgramScheduleItemCollectionType.Artist, null, null, null, ArtistId, PlaybackOrder.Shuffle, null, null, TailMode.None, null, GuideMode.Normal, null, null, null, null, null, null, null, null, null), _cts.Token);
             _navigationManager.NavigateTo($"/schedules/{schedule.Id}/items");
         }
     }

ErsatzTV/Pages/ScheduleItemsEditor.razor

@@ -5,6 +5,7 @@
 @using ErsatzTV.Application.Television
 @using ErsatzTV.Application.Watermarks
 @using ErsatzTV.Application.Filler
+@using System.Globalization
 @using ErsatzTV.Core.Domain.Filler
 @using ErsatzTV.Application.Artists
 @implements IDisposable
@@ -222,20 +223,13 @@
                     <MudSelectItem Value="@GuideMode.Normal">Normal</MudSelectItem>
                     <MudSelectItem Value="@GuideMode.Filler">Filler</MudSelectItem>
                 </MudSelect>
-                        <MudSelect Class="mt-3" Label="Watermark" @bind-Value="@_selectedItem.Watermark" For="@(() => _selectedItem.Watermark)" Clearable="true">
-                            @foreach (WatermarkViewModel watermark in _watermarks)
-                            {
-                                <MudSelectItem Value="@watermark">@watermark.Name</MudSelectItem>
-                            }
-                        </MudSelect>
             </MudCardContent>
         </MudCard>
     </div>
     <div style="flex-grow: 1; max-width: 400px;">
         <MudCard>
             <MudCardContent>
-                        <MudSelect Class="mt-3"
-                                   T="FillerPresetViewModel"
+                <MudSelect T="FillerPresetViewModel"
                            Label="Pre-Roll Filler"
                            @bind-value="_selectedItem.PreRollFiller"
                            Clearable="true">
@@ -286,6 +280,44 @@
                 </MudSelect>
             </MudCardContent>
         </MudCard>
+        <MudCard Class="mt-4">
+            <MudCardContent>
+                <MudSelect Label="Watermark" @bind-Value="@_selectedItem.Watermark" For="@(() => _selectedItem.Watermark)" Clearable="true">
+                    @foreach (WatermarkViewModel watermark in _watermarks)
+                    {
+                        <MudSelectItem Value="@watermark">@watermark.Name</MudSelectItem>
+                    }
+                </MudSelect>
+                <MudSelect Class="mt-3"
+                           Label="Preferred Audio Language"
+                           @bind-Value="_selectedItem.PreferredAudioLanguageCode"
+                           For="@(() => _selectedItem.PreferredAudioLanguageCode)"
+                           Clearable="true">
+                    <MudSelectItem Value="@((string)null)">(none)</MudSelectItem>
+                    @foreach (CultureInfo culture in _availableCultures)
+                    {
+                        <MudSelectItem Value="@culture.ThreeLetterISOLanguageName">@culture.EnglishName</MudSelectItem>
+                    }
+                </MudSelect>
+                <MudSelect Class="mt-3"
+                           Label="Preferred Subtitle Language"
+                           @bind-Value="_selectedItem.PreferredSubtitleLanguageCode"
+                           For="@(() => _selectedItem.PreferredSubtitleLanguageCode)"
+                           Clearable="true">
+                    <MudSelectItem Value="@((string)null)">(none)</MudSelectItem>
+                    @foreach (CultureInfo culture in _availableCultures)
+                    {
+                        <MudSelectItem Value="@culture.ThreeLetterISOLanguageName">@culture.EnglishName</MudSelectItem>
+                    }
+                </MudSelect>
+                <MudSelect T="ChannelSubtitleMode?" Class="mt-3" Label="Subtitle Mode" @bind-Value="_selectedItem.SubtitleMode" For="@(() => _selectedItem.SubtitleMode)" Clearable="true">
+                    <MudSelectItem T="ChannelSubtitleMode?" Value="@(ChannelSubtitleMode.None)">None</MudSelectItem>
+                    <MudSelectItem T="ChannelSubtitleMode?" Value="@(ChannelSubtitleMode.Forced)">Forced</MudSelectItem>
+                    <MudSelectItem T="ChannelSubtitleMode?" Value="@(ChannelSubtitleMode.Default)">Default</MudSelectItem>
+                    <MudSelectItem T="ChannelSubtitleMode?" Value="@(ChannelSubtitleMode.Any)">Any</MudSelectItem>
+                </MudSelect>
+            </MudCardContent>
+        </MudCard>
     </div>
     </div>
     </EditForm>
@@ -307,6 +339,7 @@
     private List<NamedMediaItemViewModel> _artists;
     private List<FillerPresetViewModel> _fillerPresets;
     private List<WatermarkViewModel> _watermarks;
+    private List<CultureInfo> _availableCultures;
 
     private ProgramScheduleItemEditViewModel _selectedItem;
 
@@ -337,6 +370,7 @@
             .Map(list => list.OrderBy(vm => vm.Name, StringComparer.CurrentCultureIgnoreCase).ToList());
         _watermarks = await _mediator.Send(new GetAllWatermarks(), _cts.Token)
             .Map(list => list.OrderBy(vm => vm.Name, StringComparer.CurrentCultureIgnoreCase).ToList());
+        _availableCultures = await _mediator.Send(new GetAllLanguageCodes(), _cts.Token);
 
         string name = string.Empty;
         var shuffleScheduleItems = false;
@@ -386,7 +420,10 @@
             PostRollFiller = item.PostRollFiller,
             TailFiller = item.TailFiller,
             FallbackFiller = item.FallbackFiller,
-            Watermark = item.Watermark
+            Watermark = item.Watermark,
+            PreferredAudioLanguageCode = item.PreferredAudioLanguageCode,
+            PreferredSubtitleLanguageCode = item.PreferredSubtitleLanguageCode,
+            SubtitleMode = item.SubtitleMode
         };
 
         switch (item)
@@ -461,7 +498,10 @@
             item.PostRollFiller?.Id,
             item.TailFiller?.Id,
             item.FallbackFiller?.Id,
-            item.Watermark?.Id)).ToList();
+            item.Watermark?.Id,
+            item.PreferredAudioLanguageCode,
+            item.PreferredSubtitleLanguageCode,
+            item.SubtitleMode)).ToList();
 
         Seq<BaseError> errorMessages = await _mediator.Send(new ReplaceProgramScheduleItems(Id, items), _cts.Token).Map(e => e.LeftToSeq());
 

ErsatzTV/Pages/TelevisionEpisodeList.razor

@@ -219,7 +219,7 @@
         DialogResult result = await dialog.Result;
         if (!result.Cancelled && result.Data is ProgramScheduleViewModel schedule)
         {
-            await _mediator.Send(new AddProgramScheduleItem(schedule.Id, StartType.Dynamic, null, PlayoutMode.One, ProgramScheduleItemCollectionType.TelevisionSeason, null, null, null, SeasonId, PlaybackOrder.Shuffle, null, null, TailMode.None, null, GuideMode.Normal, null, null, null, null, null, null), _cts.Token);
+            await _mediator.Send(new AddProgramScheduleItem(schedule.Id, StartType.Dynamic, null, PlayoutMode.One, ProgramScheduleItemCollectionType.TelevisionSeason, null, null, null, SeasonId, PlaybackOrder.Shuffle, null, null, TailMode.None, null, GuideMode.Normal, null, null, null, null, null, null, null, null, null), _cts.Token);
             _navigationManager.NavigateTo($"/schedules/{schedule.Id}/items");
         }
     }

ErsatzTV/Pages/TelevisionSeasonList.razor

@@ -228,7 +228,7 @@
         DialogResult result = await dialog.Result;
         if (!result.Cancelled && result.Data is ProgramScheduleViewModel schedule)
         {
-            await _mediator.Send(new AddProgramScheduleItem(schedule.Id, StartType.Dynamic, null, PlayoutMode.One, ProgramScheduleItemCollectionType.TelevisionShow, null, null, null, ShowId, PlaybackOrder.Shuffle, null, null, TailMode.None, null, GuideMode.Normal, null, null, null, null, null, null), _cts.Token);
+            await _mediator.Send(new AddProgramScheduleItem(schedule.Id, StartType.Dynamic, null, PlayoutMode.One, ProgramScheduleItemCollectionType.TelevisionShow, null, null, null, ShowId, PlaybackOrder.Shuffle, null, null, TailMode.None, null, GuideMode.Normal, null, null, null, null, null, null, null, null, null), _cts.Token);
             _navigationManager.NavigateTo($"/schedules/{schedule.Id}/items");
         }
     }

ErsatzTV/ViewModels/ProgramScheduleItemEditViewModel.cs

@@ -65,6 +65,9 @@ public class ProgramScheduleItemEditViewModel : INotifyPropertyChanged
     public FillerPresetViewModel TailFiller { get; set; }
     public FillerPresetViewModel FallbackFiller { get; set; }
     public WatermarkViewModel Watermark { get; set; }
+    public string PreferredAudioLanguageCode { get; set; }
+    public string PreferredSubtitleLanguageCode { get; set; }
+    public ChannelSubtitleMode? SubtitleMode { get; set; }
 
     public string CollectionName => CollectionType switch
     {