Merge pull request #570 from stonerl/close-fullscreen-on-end

add option to exit fullscreen on end

Model/Player/Backends/PlayerBackend.swift

@@ -111,15 +111,22 @@ extension PlayerBackend {
             model.prepareCurrentItemForHistory(finished: true)
 
             if model.queue.isEmpty {
-                if Defaults[.closeVideoOnEOF] {
-                    #if os(tvOS)
+                #if os(tvOS)
+                    if Defaults[.closeVideoOnEOF] {
                         if model.activeBackend == .appleAVPlayer {
                             model.avPlayerBackend.controller?.dismiss(animated: false)
                         }
-                    #endif
-                    model.resetQueue()
-                    model.hide()
-                }
+                        model.resetQueue()
+                        model.hide()
+                    }
+                #else
+                    if Defaults[.closeVideoOnEOF] {
+                        model.resetQueue()
+                        model.hide()
+                    } else if Defaults[.exitFullscreenOnEOF], model.playingFullScreen {
+                        model.exitFullScreen()
+                    }
+                #endif
             } else {
                 model.advanceToNextItem()
             }

Model/Player/PlayerModel.swift

@@ -1001,6 +1001,7 @@ final class PlayerModel: ObservableObject {
 
         logger.info("entering fullscreen")
         toggleFullscreen(false, showControls: showControls)
+        self.playingFullScreen = true
     }
 
     func exitFullScreen(showControls: Bool = true) {
@@ -1008,6 +1009,7 @@ final class PlayerModel: ObservableObject {
 
         logger.info("exiting fullscreen")
         toggleFullscreen(true, showControls: showControls)
+        self.playingFullScreen = false
     }
 
     func updateNowPlayingInfo() {