Skip to content

Commit fa25fc4

Browse files
remove manual slider
1 parent 6043f48 commit fa25fc4

2 files changed

Lines changed: 8 additions & 27 deletions

File tree

RemoteCam/CameraVideoStates.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,29 +70,29 @@ extension RemoteCamSession {
7070
self.sendCommandOrGoToScanning(peer: [peer], msg: c)
7171
^{
7272
alert?.dismiss(animated: true) {
73-
self.mailbox.addOperation(BlockOperation {
73+
self.mailbox.addOperation {
7474
self.popToState(name: self.states.camera)
75-
})
75+
}
7676
}
7777
}
7878

7979
case let c as DisconnectPeer:
8080
if c.peer.displayName == peer.displayName && self.session.connectedPeers.count == 0 {
8181
^{
8282
alert?.dismiss(animated: true) {
83-
self.mailbox.addOperation(BlockOperation {
83+
self.mailbox.addOperation {
8484
self.popAndStartScanning()
85-
})
85+
}
8686
}
8787
}
8888
}
8989

9090
case is Disconnect:
9191
^{
9292
alert?.dismiss(animated: true) {
93-
self.mailbox.addOperation(BlockOperation {
93+
self.mailbox.addOperation {
9494
self.popAndStartScanning()
95-
})
95+
}
9696
}
9797
}
9898

RemoteCam/MonitorViewController.swift

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,6 @@ public class MonitorViewController: iAdViewController, UIImagePickerControllerDe
220220
@IBOutlet weak var recordingView: UIImageView!
221221

222222
// MARK: - Zoom and Lens Controls
223-
@IBOutlet weak var zoomSlider: UISlider?
224223
@IBOutlet weak var zoomLabel: UILabel?
225224
@IBOutlet weak var lensSegmentedControl: UISegmentedControl?
226225

@@ -305,7 +304,6 @@ public class MonitorViewController: iAdViewController, UIImagePickerControllerDe
305304
toggleCamera.isHidden = false
306305
programmaticToggleCameraButton?.isEnabled = true
307306
programmaticToggleCameraButton?.isHidden = false
308-
zoomSlider?.isEnabled = true
309307
lensSegmentedControl?.isEnabled = true
310308
// Enable programmatic controls
311309
programmaticZoomSlider.isEnabled = true
@@ -331,7 +329,6 @@ public class MonitorViewController: iAdViewController, UIImagePickerControllerDe
331329
toggleCamera.isHidden = false
332330
programmaticToggleCameraButton?.isEnabled = true
333331
programmaticToggleCameraButton?.isHidden = false
334-
zoomSlider?.isEnabled = true
335332
lensSegmentedControl?.isEnabled = true
336333
// Enable programmatic controls
337334
programmaticZoomSlider.isEnabled = true
@@ -357,7 +354,6 @@ public class MonitorViewController: iAdViewController, UIImagePickerControllerDe
357354
toggleCamera.isHidden = true
358355
programmaticToggleCameraButton?.isEnabled = false
359356
programmaticToggleCameraButton?.isHidden = true
360-
zoomSlider?.isEnabled = false
361357
lensSegmentedControl?.isEnabled = false
362358
// Disable programmatic controls
363359
programmaticZoomSlider.isEnabled = false
@@ -381,18 +377,13 @@ public class MonitorViewController: iAdViewController, UIImagePickerControllerDe
381377
session ! UICmd.ToggleFlash()
382378
}
383379

384-
// MARK: - Zoom Control Actions
385-
@IBAction func onZoomSliderChange(sender: UISlider) {
380+
@objc func onProgrammaticZoomSliderChange(sender: UISlider) {
386381
let zoomFactor = CGFloat(sender.value)
387382
currentZoomFactor = zoomFactor
388383
updateZoomLabel()
389384
session ! UICmd.SetZoom(zoomFactor: zoomFactor)
390385
}
391386

392-
@objc func onProgrammaticZoomSliderChange(sender: UISlider) {
393-
onZoomSliderChange(sender: sender)
394-
}
395-
396387
// MARK: - Lens Control Actions
397388
@IBAction func onLensSegmentedControlChanged(sender: UISegmentedControl) {
398389
let orderedAvailableLenses = getOrderedAvailableLenses()
@@ -584,7 +575,6 @@ public class MonitorViewController: iAdViewController, UIImagePickerControllerDe
584575

585576
// Update any visible sliders to match
586577
OperationQueue.main.addOperation { [weak self] in
587-
self?.zoomSlider?.value = Float(clampedZoomFactor)
588578
self?.programmaticZoomSlider.value = Float(clampedZoomFactor)
589579
}
590580
}
@@ -656,14 +646,7 @@ public class MonitorViewController: iAdViewController, UIImagePickerControllerDe
656646

657647
// MARK: - Zoom UI Configuration
658648
private func configureZoomUI() {
659-
// Configure both storyboard and programmatic controls
660-
if let zoomSlider = self.zoomSlider {
661-
zoomSlider.minimumValue = 1.0
662-
zoomSlider.maximumValue = Float(maxZoomFactor)
663-
zoomSlider.value = Float(currentZoomFactor)
664-
zoomSlider.addTarget(self, action: #selector(onZoomSliderChange), for: .valueChanged)
665-
}
666-
649+
// Configure programmatic controls
667650
programmaticZoomSlider.minimumValue = 1.0
668651
programmaticZoomSlider.maximumValue = Float(maxZoomFactor)
669652
programmaticZoomSlider.value = Float(currentZoomFactor)
@@ -716,8 +699,6 @@ public class MonitorViewController: iAdViewController, UIImagePickerControllerDe
716699
maxZoomFactor = maxZoom
717700

718701
OperationQueue.main.addOperation { [weak self] in
719-
self?.zoomSlider?.maximumValue = Float(maxZoom)
720-
self?.zoomSlider?.value = Float(zoomFactor)
721702
self?.programmaticZoomSlider.maximumValue = Float(maxZoom)
722703
self?.programmaticZoomSlider.value = Float(zoomFactor)
723704
self?.updateZoomLabel()

0 commit comments

Comments
 (0)