VLC

Brand/Database.swift

@@ -26,4 +26,4 @@ import Foundation
 // Database Realm
 //
 let databaseName                    = "nextcloud.realm"
-let databaseSchemaVersion: UInt64   = 279
+let databaseSchemaVersion: UInt64   = 280

iOSClient/Data/NCManageDatabase+Video.swift

@@ -31,7 +31,6 @@ class tableVideo: Object {
     @objc dynamic var length: Int = 0
     @objc dynamic var ocId = ""
     @objc dynamic var position: Float = 0
-    @objc dynamic var autoplay: Bool = false
     @objc dynamic var codecNameVideo: String?
     @objc dynamic var codecNameAudio: String?
     @objc dynamic var codecAudioChannelLayout: String?
@@ -46,7 +45,7 @@ class tableVideo: Object {
 
 extension NCManageDatabase {
 
-    func addVideo(metadata: tableMetadata, position: Float, length: Int? = nil, autoplay: Bool) {
+    func addVideo(metadata: tableMetadata, position: Float, length: Int? = nil) {
 
         if metadata.livePhoto { return }
         let realm = try! Realm()
@@ -59,7 +58,6 @@ extension NCManageDatabase {
                         result.length = length
                     }
                     result.position = position
-                    result.autoplay = autoplay
                     realm.add(result, update: .all)
 
                 } else {
@@ -72,7 +70,6 @@ extension NCManageDatabase {
                     }
                     addObject.ocId = metadata.ocId
                     addObject.position = position
-                    addObject.autoplay = autoplay
                     realm.add(addObject, update: .all)
                 }
             }
@@ -151,18 +148,6 @@ extension NCManageDatabase {
         return result.position
     }
 
-    func getVideoAutoplay(metadata: tableMetadata) -> Bool {
-
-        if metadata.livePhoto { return false }
-        let realm = try! Realm()
-
-        guard let result = realm.objects(tableVideo.self).filter("account == %@ AND ocId == %@", metadata.account, metadata.ocId).first else {
-            return false
-        }
-
-        return result.autoplay
-    }
-
     func deleteVideo(metadata: tableMetadata) {
 
         let realm = try! Realm()

iOSClient/Viewer/NCViewerMedia/NCPlayer/NCPlayer.swift

@@ -135,15 +135,9 @@ class NCPlayer: NSObject {
             view.addGestureRecognizer(singleTapGestureRecognizer)
         }
 
-        if NCManageDatabase.shared.getVideoAutoplay(metadata: metadata) {
-            playerPlay()
-            playerToolBar?.show(enableTimerAutoHide: true)
-        } else {
-            playerToolBar?.show(enableTimerAutoHide: false)
-        }
-
         playerToolBar?.setBarPlayer(ncplayer: self, position: position)
         playerToolBar?.setMetadata(self.metadata)
+        playerToolBar?.show(enableTimerAutoHide: false)
 
         if let media = player?.media {
             thumbnailer = VLCMediaThumbnailer(media: media, andDelegate: self)
@@ -227,7 +221,7 @@ class NCPlayer: NSObject {
         if metadata.classFile == NKCommon.TypeClassFile.audio.rawValue { return }
         let length = Int(player?.media?.length.intValue ?? 0)
 
-        NCManageDatabase.shared.addVideo(metadata: metadata, position: position, length: length, autoplay: isPlay())
+        NCManageDatabase.shared.addVideo(metadata: metadata, position: position, length: length)
     }
 
     func snapshot() {
@@ -294,7 +288,7 @@ extension NCPlayer: VLCMediaPlayerDelegate {
         switch player.state {
         case .stopped:
             if let url = self.url {
-                NCManageDatabase.shared.addVideo(metadata: metadata, position: 0, autoplay: false)
+                NCManageDatabase.shared.addVideo(metadata: metadata, position: 0)
                 if !(self.detailView?.isShow() ?? false) {
                     NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterShowPlayerToolBar, userInfo: ["ocId": self.metadata.ocId, "enableTimerAutoHide": false])
                 }

iOSClient/Viewer/NCViewerMedia/NCViewerMedia.swift

@@ -177,10 +177,6 @@ class NCViewerMedia: UIViewController {
                             self.viewerMediaPage?.updateCommandCenter(ncplayer: ncplayer, metadata: self.metadata)
                         }
                     }
-                } else {
-                    if NCManageDatabase.shared.getVideoAutoplay(metadata: self.metadata) {
-                        ncplayer.playerPlay()
-                    }
                 }
             }