Replace Browser widget "Audio and video only" toggle with Mode picker (#219)

Author: Copilot

Moblin/RemoteControl/RemoteControl.swift

@@ -223,15 +223,15 @@ struct RemoteControlRemoteSceneSettingsWidgetTypeBrowser: Codable {
     var url: String
     var width: Int
     var height: Int
-    var audioAndVideoOnly: Bool
+    var mode: SettingsWidgetBrowserMode
     var fps: Float
     var styleSheet: String
 
     init(browser: SettingsWidgetBrowser) {
         url = browser.url
         width = browser.width
         height = browser.height
-        audioAndVideoOnly = browser.audioAndVideoOnly
+        mode = browser.mode
         fps = browser.baseFps
         styleSheet = browser.styleSheet
     }
@@ -241,7 +241,7 @@ struct RemoteControlRemoteSceneSettingsWidgetTypeBrowser: Codable {
         browser.url = url
         browser.width = width
         browser.height = height
-        browser.audioAndVideoOnly = audioAndVideoOnly
+        browser.mode = mode
         browser.baseFps = fps
         browser.styleSheet = styleSheet
         return browser

Moblin/Various/Settings/SettingsScene.swift

@@ -773,11 +773,25 @@ class SettingsWidgetCrop: Codable {
     }
 }
 
+enum SettingsWidgetBrowserMode: Codable, CaseIterable {
+    case periodicAudioAndVideo
+    case audioAndVideoOnly
+
+    func toString() -> String {
+        switch self {
+        case .periodicAudioAndVideo:
+            return String(localized: "Periodic, audio and video")
+        case .audioAndVideoOnly:
+            return String(localized: "Audio and video only")
+        }
+    }
+}
+
 class SettingsWidgetBrowser: Codable, ObservableObject {
     @Published var url: String = ""
     @Published var width: Int = 500
     @Published var height: Int = 500
-    @Published var audioAndVideoOnly: Bool = false
+    @Published var mode: SettingsWidgetBrowserMode = .periodicAudioAndVideo
     @Published var baseFps: Float = 5.0
     @Published var styleSheet: String = ""
     @Published var moblinAccess: Bool = false
@@ -789,6 +803,7 @@ class SettingsWidgetBrowser: Codable, ObservableObject {
              width,
              height,
              audioOnly,
+             mode,
              fps,
              styleSheet,
              moblinAccess
@@ -799,7 +814,7 @@ class SettingsWidgetBrowser: Codable, ObservableObject {
         try container.encode(.url, url)
         try container.encode(.width, width)
         try container.encode(.height, height)
-        try container.encode(.audioOnly, audioAndVideoOnly)
+        try container.encode(.mode, mode)
         try container.encode(.fps, baseFps)
         try container.encode(.styleSheet, styleSheet)
         try container.encode(.moblinAccess, moblinAccess)
@@ -810,7 +825,12 @@ class SettingsWidgetBrowser: Codable, ObservableObject {
         url = container.decode(.url, String.self, "")
         width = container.decode(.width, Int.self, 500)
         height = container.decode(.height, Int.self, 500)
-        audioAndVideoOnly = container.decode(.audioOnly, Bool.self, false)
+        if let decodedMode = try? container.decode(SettingsWidgetBrowserMode.self, forKey: .mode) {
+            mode = decodedMode
+        } else {
+            let audioOnly = container.decode(.audioOnly, Bool.self, false)
+            mode = audioOnly ? .audioAndVideoOnly : .periodicAudioAndVideo
+        }
         baseFps = container.decode(.fps, Float.self, 5.0)
         styleSheet = container.decode(.styleSheet, String.self, "")
         moblinAccess = container.decode(.moblinAccess, Bool.self, false)

Moblin/VideoEffects/Browser/BrowserEffect.swift

@@ -75,7 +75,7 @@ final class BrowserEffect: VideoEffect {
         baseFps = Double(widget.baseFps)
         fps = baseFps
         isLoaded = false
-        audioAndVideoOnly = widget.audioAndVideoOnly
+        audioAndVideoOnly = widget.mode == .audioAndVideoOnly
         width = Double(widget.width)
         height = Double(widget.height)
         snapshotConfiguration = WKSnapshotConfiguration()

Moblin/View/Settings/Scenes/Widgets/Widget/Browser/WidgetBrowserSettingsView.swift

@@ -88,11 +88,15 @@ struct WidgetBrowserSettingsView: View {
                                    keyboardType: .numbersAndPunctuation)
         }
         Section {
-            Toggle("Audio and video only", isOn: $browser.audioAndVideoOnly)
-                .onChange(of: browser.audioAndVideoOnly) { _ in
-                    model.resetSelectedScene(changeScene: false)
+            Picker("Mode", selection: $browser.mode) {
+                ForEach(SettingsWidgetBrowserMode.allCases, id: \.self) {
+                    Text($0.toString())
                 }
-            if !browser.audioAndVideoOnly {
+            }
+            .onChange(of: browser.mode) { _ in
+                model.resetSelectedScene(changeScene: false)
+            }
+            if browser.mode == .periodicAudioAndVideo {
                 HStack {
                     Text("Base FPS")
                     SliderView(
@@ -108,7 +112,7 @@ struct WidgetBrowserSettingsView: View {
             }
         } footer: {
             Text("""
-            When \"Audio and video only\" is enabled, images, text, GIFs etc. \
+            When \"Audio and video only\" mode is selected, images, text, GIFs etc. \
             will only be shown when a video (.mp4/.mov) is playing, reducing overall \
             energy consumption.
             """)