diff --git a/CHANGELOG.md b/CHANGELOG.md index bc700bd7a..4c1635b08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Templates should be copied from `_default.ass.sbntxt` which is located in the config subfolder `templates/music-video-credits` - Copy the file, give it any name ending with `.ass.sbntext`, and only make edits to the copied file - The default template will be extracted and overwritten every time ErsatzTV is started - - The template is a [Sub Station Alpha](http://www.tcax.org/docs/ass-specs.htm) file using [scribian](https://github.com/scriban/scriban/tree/master/doc) template syntax + - The template is an [Advanced SubStation Alpha](http://www.tcax.org/docs/ass-specs.htm) file using [scribian](https://github.com/scriban/scriban/tree/master/doc) template syntax - The following fields are available for use in the template: - `resolution`: the ffmpeg profile's resolution, which is used for margin calculations - `title`: the title of the music video diff --git a/ErsatzTV.Application/Streaming/Queries/GetPlayoutItemProcessByChannelNumberHandler.cs b/ErsatzTV.Application/Streaming/Queries/GetPlayoutItemProcessByChannelNumberHandler.cs index 5780dc3b4..fa81ea2be 100644 --- a/ErsatzTV.Application/Streaming/Queries/GetPlayoutItemProcessByChannelNumberHandler.cs +++ b/ErsatzTV.Application/Streaming/Queries/GetPlayoutItemProcessByChannelNumberHandler.cs @@ -93,6 +93,9 @@ public class GetPlayoutItemProcessByChannelNumberHandler : FFmpegProcessHandler< .ThenInclude(mi => (mi as MusicVideo).MusicVideoMetadata) .ThenInclude(mvm => mvm.Subtitles) .Include(i => i.MediaItem) + .ThenInclude(mi => (mi as MusicVideo).MusicVideoMetadata) + .ThenInclude(mvm => mvm.Artists) + .Include(i => i.MediaItem) .ThenInclude(mi => (mi as MusicVideo).MediaVersions) .ThenInclude(mv => mv.MediaFiles) .Include(i => i.MediaItem) diff --git a/ErsatzTV/Resources/Templates/_default.ass.sbntxt b/ErsatzTV/Resources/Templates/_default.ass.sbntxt index 864417496..26139787c 100644 --- a/ErsatzTV/Resources/Templates/_default.ass.sbntxt +++ b/ErsatzTV/Resources/Templates/_default.ass.sbntxt @@ -5,9 +5,11 @@ ScaledBorderAndShadow: yes YCbCr Matrix: None PlayResX: {{ resolution.width }} PlayResY: {{ resolution.height }} + [V4+ Styles] -Format: Name, Fontname, Fontsize, PrimaryColour, OutlineColour, BorderStyle, Outline, Shadow, Alignment, Encoding -Style: Default,OPTIKabel-Heavy,{{ resolution.height // 20.0 }},&HFFFFFF,&H444444,1,1,3,0,1 +Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding +Style: Default,OPTIKabel-Heavy,{{ resolution.height // 20.0 }},&HFFFFFF,&HFFFFFF,&H444444,&H00000000,0,0,0,0,100,100,0,0,1,1,3,0,10,10,10,1 + [Events] Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text Dialogue: 0,00:00:09.00,00:00:16.00,Default,,{{ resolution.width * 0.03 | math.round }},{{ resolution.width * 0.03 | math.round }},{{ resolution.height * 0.05 | math.round }},,{fad(1200, 1200)}{{ if all_artists | array.size == 0 }}{{ artist }}{{ else }}{{ all_artists | array.join " / " }}{{ end }}\N"{{ title }}"{{ if album }}\N{{ album }}{{ end }}