v1.4.1(49)

- Add option close or keep open when media player done. - Fix bug on custom FFmpeg player skip button when media is preloading.
lithium0003 · Nov 18, 2019 · 8bb7f55 · 8bb7f55
1 parent d0837e6
commit 8bb7f55
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 28 deletions.
diff --git a/ccViewer/CryptCloudViewer.xcodeproj/project.pbxproj b/ccViewer/CryptCloudViewer.xcodeproj/project.pbxproj
@@ -813,7 +813,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = ccViewer/ccViewer.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 47;
+				CURRENT_PROJECT_VERSION = 49;
 				DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
 				DEVELOPMENT_TEAM = 7A9X38B4YU;
 				"ENABLE_HARDENED_RUNTIME[sdk=macosx*]" = YES;
@@ -828,6 +828,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.4.1;
 				OTHER_LDFLAGS = (
 					"-ObjC",
 					"-lc++",
@@ -847,7 +848,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = ccViewer/ccViewer.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 47;
+				CURRENT_PROJECT_VERSION = 49;
 				DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
 				DEVELOPMENT_TEAM = 7A9X38B4YU;
 				"ENABLE_HARDENED_RUNTIME[sdk=macosx*]" = YES;
@@ -862,6 +863,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.4.1;
 				OTHER_LDFLAGS = (
 					"-ObjC",
 					"-lc++",

diff --git a/ccViewer/ccViewer/Base.lproj/Main.storyboard b/ccViewer/ccViewer/Base.lproj/Main.storyboard
diff --git a/ccViewer/ccViewer/CustomPlayerViewController.swift b/ccViewer/ccViewer/CustomPlayerViewController.swift
@@ -111,7 +111,6 @@ class CustomPlayerView: NSObject, AVPlayerViewControllerDelegate {
         return viewController
     }()
 
-    var finish = false
     var iscancel = false
     var isVideo = false
 
@@ -414,8 +413,16 @@ class CustomPlayerView: NSObject, AVPlayerViewControllerDelegate {
 
     func nextTrack() {
         let url = prevURL
+        var reload = UserDefaults.standard.bool(forKey: "keepOpenWhenDone")
         if player.items().count <= 2 {
             if loop {
+                reload = false
+                loopSetup()
+            }
+            if reload {
+                if player.items().count > 1 {
+                    reload = false
+                }
                 loopSetup()
             }
         }
@@ -447,6 +454,9 @@ class CustomPlayerView: NSObject, AVPlayerViewControllerDelegate {
                 }
             }
         }
+        if reload {
+            player.pause()
+        }
     }
 
     @objc func didPlayToEndTime(_ notification: Notification) {
@@ -461,18 +471,19 @@ class CustomPlayerView: NSObject, AVPlayerViewControllerDelegate {
 
     func playerViewController(_ playerViewController: AVPlayerViewController, restoreUserInterfaceForPictureInPictureStopWithCompletionHandler completionHandler: @escaping (Bool) -> Void) {
 
-        if let currentViewController = UIApplication.topViewController() {
+        if let currentViewController = UIApplication.topViewController(), !iscancel {
             currentViewController.present(playerViewController, animated: true) {
                 completionHandler(true)
             }
         }
+        else {
+            finishDisplay()
+            completionHandler(true)
+        }
     }
 
     func playerViewControllerDidStopPictureInPicture(_ playerViewController: AVPlayerViewController) {
         CustomPlayerView.pipVideo = false
-        if playerViewController.player?.rate ?? 0 == 0 {
-            finishDisplay()
-        }
     }
 
     func finishDisplay() {

diff --git a/ccViewer/ccViewer/Info.plist b/ccViewer/ccViewer/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>

diff --git a/ccViewer/ccViewer/TableViewControllerSetting.swift b/ccViewer/ccViewer/TableViewControllerSetting.swift
@@ -95,7 +95,8 @@ class TableViewControllerSetting: UITableViewController, UITextFieldDelegate {
                     [NSLocalizedString("Start skip", comment: ""),
                      NSLocalizedString("Stop after specified duration", comment: "")],
                     [NSLocalizedString("Skip foward (sec)", comment: ""),
-                     NSLocalizedString("Skip backward (sec)", comment: "")],
+                     NSLocalizedString("Skip backward (sec)", comment: ""),
+                     NSLocalizedString("Keep open when done", comment: "")],
                     [NSLocalizedString("Ignore overlay subtiles", comment: ""),
                      NSLocalizedString("Auto select streams", comment: "")],
                     [NSLocalizedString("View online help", comment: ""),
@@ -250,6 +251,12 @@ class TableViewControllerSetting: UITableViewController, UITextFieldDelegate {
                     UserDefaults.standard.set(value, forKey: "playSkipBackwardSec")
                 }
                 cell.accessoryView = picker
+            case 2:
+                let aSwitch = UISwitch()
+                aSwitch.addTarget(self, action: #selector(switchChanged), for: .valueChanged)
+                aSwitch.isOn = UserDefaults.standard.bool(forKey: "keepOpenWhenDone")
+                aSwitch.tag = 14
+                cell.accessoryView = aSwitch
             default:
                 break
             }
@@ -322,6 +329,8 @@ class TableViewControllerSetting: UITableViewController, UITextFieldDelegate {
             UserDefaults.standard.set(value, forKey: "noOverlaySubtitles")
         case 13:
             UserDefaults.standard.set(value, forKey: "autoSelectStreams")
+        case 14:
+            UserDefaults.standard.set(value, forKey: "keepOpenWhenDone")
         default:
             break
         }

diff --git a/ccViewer/ccViewer/ja.lproj/Localizable.strings b/ccViewer/ccViewer/ja.lproj/Localizable.strings
@@ -77,7 +77,9 @@
 "Player control" = "再生コントロール";
 "Skip foward (sec)" = "早送り (秒)";
 "Skip backward (sec)" = "巻戻し (秒)";
+"Keep open when done" = "再生終了後に閉じない";
 
 "Cast converter" = "Cast時の変換設定";
 "Ignore overlay subtiles" = "焼き込み字幕を入れない";
 "Auto select streams" = "自動で映像と焼き込み字幕を選択する";
+
diff --git a/ffplayer/ffplayer/player_base.cpp b/ffplayer/ffplayer/player_base.cpp
@@ -128,6 +128,18 @@ void Player::Quit()
         std::unique_lock<std::mutex> lk(video.pictq_mutex);
         video.pictq_cond.notify_one();
     }
+    if (video.videoStream >= 0) {
+        av_log(NULL, AV_LOG_INFO, "video abort.\n");
+        video.videoq.AbortQueue();
+    }
+    if (audio.audioStream >= 0) {
+        av_log(NULL, AV_LOG_INFO, "audio abort.\n");
+        audio.audioq.AbortQueue();
+    }
+    if (subtitle.subtitleStream >= 0) {
+        av_log(NULL, AV_LOG_INFO, "subtitle abort.\n");
+        subtitle.subtitleq.AbortQueue();
+    }
     av_usleep(100*1000);
 }