diff --git a/Kyoo/ClientApp/src/app/player/player.component.scss b/Kyoo/ClientApp/src/app/player/player.component.scss index 4371aefe..7b748502 100644 --- a/Kyoo/ClientApp/src/app/player/player.component.scss +++ b/Kyoo/ClientApp/src/app/player/player.component.scss @@ -1,4 +1,5 @@ @import "../../libraries/subtitles"; +@import "./vtt-subtitles"; .player { diff --git a/Kyoo/ClientApp/src/app/player/player.component.ts b/Kyoo/ClientApp/src/app/player/player.component.ts index 8049be03..688b579d 100644 --- a/Kyoo/ClientApp/src/app/player/player.component.ts +++ b/Kyoo/ClientApp/src/app/player/player.component.ts @@ -189,7 +189,7 @@ export class PlayerComponent implements OnInit document.getElementById("hover").classList.add("idle"); document.documentElement.style.cursor = "none"; } - }, 2000); + }, 1000); document.addEventListener("fullscreenchange", () => { @@ -313,6 +313,7 @@ export class PlayerComponent implements OnInit $(document).unbind(); $(window).unbind(); + document.exitFullscreen(); $('[data-toggle="tooltip"]').hide(); } @@ -419,6 +420,7 @@ export class PlayerComponent implements OnInit track.label = subtitle.displayName; track.srclang = subtitle.language; track.src = subtitle.link.replace(".srt", ".vtt"); + track.classList.add("subtitle_container"); track.default = true; track.onload = () => { diff --git a/Kyoo/ClientApp/src/app/player/vtt-subtitles.scss b/Kyoo/ClientApp/src/app/player/vtt-subtitles.scss new file mode 100644 index 00000000..a0f0d882 --- /dev/null +++ b/Kyoo/ClientApp/src/app/player/vtt-subtitles.scss @@ -0,0 +1,5 @@ +::cue +{ + background-color: transparent; + text-shadow: -1px -1px 0 #000, 1px -1px 0 #000, -1px 1px 0 #000, 1px 1px 0 #000; +} diff --git a/Kyoo/Controllers/SubtitleController.cs b/Kyoo/Controllers/SubtitleController.cs index 2c3eeaaa..871d4192 100644 --- a/Kyoo/Controllers/SubtitleController.cs +++ b/Kyoo/Controllers/SubtitleController.cs @@ -12,7 +12,7 @@ using System.Threading.Tasks; namespace Kyoo.Controllers { [Route("api/[controller]")] - //[ApiController] + [ApiController] public class SubtitleController : ControllerBase { private readonly ILibraryManager libraryManager; @@ -133,7 +133,10 @@ namespace Kyoo.Controllers line = null; if (lastLine == null) //The line is a timecode only if the last line is an index line and we already set it to null. + { line = line.Replace(',', '.'); + line += " line:93%"; + } return line; }