fix subs

Author: RblSb

lib/models/captions.dart

@@ -24,6 +24,31 @@ abstract class LocalClosedCaptionFile {
     }
     return null;
   }
+
+  String toSRT() {
+    final buffer = StringBuffer();
+    for (int i = 0; i < captions.length; i++) {
+      final caption = captions[i];
+      buffer.writeln(i + 1);
+      buffer.writeln(
+        '${_formatSRTTimestamp(caption.start)} --> ${_formatSRTTimestamp(caption.end)}',
+      );
+      buffer.writeln(caption.text);
+      buffer.writeln(); // blank line between entries
+    }
+    return buffer.toString();
+  }
+
+  static String _formatSRTTimestamp(Duration duration) {
+    final hours = duration.inHours.toString().padLeft(2, '0');
+    final minutes = (duration.inMinutes % 60).toString().padLeft(2, '0');
+    final seconds = (duration.inSeconds % 60).toString().padLeft(2, '0');
+    final milliseconds = (duration.inMilliseconds % 1000).toString().padLeft(
+      3,
+      '0',
+    );
+    return '$hours:$minutes:$seconds,$milliseconds';
+  }
 }
 
 class WebVTTCaptionFile extends LocalClosedCaptionFile {

lib/models/player.dart

@@ -25,6 +25,7 @@ class PlayerModel extends ChangeNotifier {
   final PlaylistModel playlist;
 
   bool showControls = false;
+  bool hasSubtitleTrack = false;
   Timer? controlsTimer;
 
   bool _showMessageIcon = false;
@@ -179,8 +180,15 @@ class PlayerModel extends ChangeNotifier {
     }();
 
     initPlayerFuture?.whenComplete(() {
+      hasSubtitleTrack = false;
       _loadCaptions(item)?.then((subs) {
-        _currentCaptions = subs;
+        var srt = subs.toSRT();
+        hasSubtitleTrack = srt.isNotEmpty;
+        player.setSubtitleTrack(
+          SubtitleTrack.data(
+            srt,
+          ),
+        );
         notifyListeners();
       });
       app.send(
@@ -194,10 +202,7 @@ class PlayerModel extends ChangeNotifier {
     notifyListeners();
   }
 
-  LocalClosedCaptionFile? _currentCaptions;
-
   String fullscreenTooltipText = 'Double-tap or long-tap to toggle fullscreen';
-  LocalClosedCaptionFile? get currentCaptions => _currentCaptions;
 
   Future<double> getVideoDuration(String url) async {
     // mediakit will parse segment durations for a minute while loading them,
@@ -454,8 +459,7 @@ class PlayerModel extends ChangeNotifier {
 
   Future<LocalClosedCaptionFile>? _loadCaptions(VideoList item) {
     if (item.url.contains('youtu')) {
-      item.subs = item.url;
-      return compute(_loadYoutubeCaptionsFuture, item);
+      return compute(_loadYoutubeCaptionsFuture, item.url);
     }
     var subsUrl = item.subs ?? '';
     if (subsUrl.isEmpty) return null;
@@ -470,10 +474,9 @@ class PlayerModel extends ChangeNotifier {
   }
 
   static Future<LocalClosedCaptionFile> _loadYoutubeCaptionsFuture(
-    VideoList item,
+    String url,
   ) async {
-    final subs = await getYoutubeSubtitles(item.url);
-    if (subs.captions.isEmpty) item.subs = '';
+    final subs = await getYoutubeSubtitles(url);
     return subs;
   }
 
@@ -609,6 +612,7 @@ class PlayerModel extends ChangeNotifier {
   }
 
   bool hasCaptions() {
+    if (hasSubtitleTrack) return true;
     final item = playlist.getItem(playlist.pos);
     final subs = item?.subs;
     return subs != null && subs.isNotEmpty;

lib/video_player.dart

@@ -66,9 +66,6 @@ class VideoPlayerScreen extends StatelessWidget {
     final playerWidth = playerState.width?.toDouble() ?? (1280 / 2);
     final playerHeight = playerState.height?.toDouble() ?? (1280 / 2);
 
-    final captionText = player.currentCaptions
-        ?.getCaptionFor(playerState.position)
-        ?.text;
     return MultiTapListener(
       onDoubleTap: () => goLandscapeOrFullscreen(player.app),
       child: GestureDetector(
@@ -89,27 +86,13 @@ class VideoPlayerScreen extends StatelessWidget {
                   height: playerHeight,
                   pauseUponEnteringBackgroundMode:
                       !player.app.hasBackgroundAudio,
+                  subtitleViewConfiguration: SubtitleViewConfiguration(
+                    textScaler: .linear(0.55),
+                    visible: player.app.showSubtitles,
+                  ),
                 ),
               ],
             ),
-            if (player.app.showSubtitles &&
-                captionText != null &&
-                captionText.isNotEmpty)
-              Align(
-                alignment: Alignment.bottomCenter,
-                child: Padding(
-                  padding: const EdgeInsets.only(bottom: 50),
-                  child: Text(
-                    captionText,
-                    style: const TextStyle(
-                      fontSize: 16,
-                      color: Colors.white,
-                      backgroundColor: Colors.black54,
-                    ),
-                    textAlign: TextAlign.center,
-                  ),
-                ),
-              ),
             _PlayPauseOverlay(player: player),
             _ChatToggleButton(player: player),
           ],