Changed smart resume conditions and implemented no subtitle audio export

arianneorpilla · May 23, 2021 · 7e78182 · 7e78182
1 parent 76526bf
commit 7e78182
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/chewie/lib/src/material_controls.dart b/chewie/lib/src/material_controls.dart
@@ -380,6 +380,9 @@ class _MaterialControlsState extends State<MaterialControls>
             openExtraShare();
             break;
           case 6:
+            chewieController.wasPlaying.value =
+                (chewieController.videoPlayerController.value.isPlaying ||
+                    chewieController.wasPlaying.value);
             chewieController.exportSingleCallback();
             break;
         }

diff --git a/lib/player.dart b/lib/player.dart
@@ -571,6 +571,18 @@ class _VideoPlayerState extends State<VideoPlayer>
     );
   }
 
+  Subtitle getExportSubtitle() {
+    if (_currentSubTrack.value == 99999) {
+      return Subtitle(
+        startTime: _videoPlayerController.value.position,
+        endTime: _videoPlayerController.value.position,
+        text: "",
+      );
+    } else {
+      return _currentSubtitle.value;
+    }
+  }
+
   void exportSingleCallback() {
     getVideoPlayerController().pause();
     _clipboard.value = "&<&>export&<&>";
@@ -580,7 +592,7 @@ class _VideoPlayerState extends State<VideoPlayer>
       getChewieController(),
       getVideoPlayerController(),
       _clipboard,
-      _currentSubtitle.value,
+      getExportSubtitle(),
       _currentDictionaryEntry.value,
       _wasPlaying.value,
       [_currentSubtitle.value],
@@ -669,7 +681,7 @@ class _VideoPlayerState extends State<VideoPlayer>
 
   void toggleShadowingMode() {
     if (_shadowingSubtitle.value == null) {
-      _shadowingSubtitle.value = _currentSubtitle.value;
+      _shadowingSubtitle.value = getExportSubtitle();
     } else {
       _shadowingSubtitle.value = null;
     }
@@ -1719,7 +1731,9 @@ class _VideoPlayerState extends State<VideoPlayer>
           _wasPlaying.value),
     );
 
-    if (wasPlaying && !isExporting) {
+    if (wasPlaying &&
+        !isExporting &&
+        (!getFocusMode() || _clipboard.value == "")) {
       getVideoPlayerController().play();
     }
   }

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -2,7 +2,7 @@ name: jidoujisho
 description: A mobile video player tailored for Japanese language learners. 
 publish_to: none
 
-version: 0.16.6+30
+version: 0.16.7+30
 
 environment:
   sdk: ">=2.7.0 <3.0.0"