Remove the background image function

vcamapp · Sep 23, 2023 · 9bef119 · 9bef119
1 parent 482817e
commit 9bef119
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 67 deletions.
diff --git a/app/xcode/Sources/VCamCamera/CoreMediaIO+.swift b/app/xcode/Sources/VCamCamera/CoreMediaIO+.swift
@@ -20,4 +20,5 @@ public extension CMIOObjectPropertySelector {
     static let systemObject = Self.init(kCMIOObjectSystemObject)
     static let hardwarePropertyDevices = Self.init(kCMIOHardwarePropertyDevices)
     static let deviceUID = Self.init(kCMIODevicePropertyDeviceUID)
+    static let devicePropertyStreams = Self.init(kCMIODevicePropertyStreams)
 }
diff --git a/app/xcode/Sources/VCamCamera/CoreMediaSinkStream.swift b/app/xcode/Sources/VCamCamera/CoreMediaSinkStream.swift
@@ -216,9 +216,9 @@ public final class CoreMediaSinkStream: NSObject {
         var dataSize: UInt32 = 0
         var dataUsed: UInt32 = 0
         var opa = CMIOObjectPropertyAddress(
-            mSelector: CMIOObjectPropertySelector(kCMIODevicePropertyStreams),
-            mScope: CMIOObjectPropertyScope(kCMIOObjectPropertyScopeGlobal),
-            mElement: CMIOObjectPropertyElement(kCMIOObjectPropertyElementMain)
+            mSelector: .devicePropertyStreams,
+            mScope: .global,
+            mElement: .main
         )
         CMIOObjectGetPropertyDataSize(deviceId, &opa, 0, nil, &dataSize)
 

diff --git a/app/xcode/Sources/VCamLocalization/Generated.swift b/app/xcode/Sources/VCamLocalization/Generated.swift
@@ -402,6 +402,8 @@ public enum L10n {
   public static let seeDocumentation = LocalizedString(lookupKey: "seeDocumentation")
   /// Select All
   public static let selectAll = LocalizedString(lookupKey: "selectAll")
+  /// Set As Background
+  public static let setAsBackground = LocalizedString(lookupKey: "setAsBackground")
   /// Settings
   public static let settings = LocalizedString(lookupKey: "settings")
   /// Set up

diff --git a/app/xcode/Sources/VCamLocalization/VCamResources/en.lproj/Localizable.strings b/app/xcode/Sources/VCamLocalization/VCamResources/en.lproj/Localizable.strings
@@ -103,6 +103,7 @@
 "deleteSelectedObject" = "Delete Selected Object";
 "interact" = "Interact";
 "localFile" = "Local File";
+"setAsBackground" = "Set As Background";
 
 "moveInitialPosition" = "Reset position";
 

diff --git a/app/xcode/Sources/VCamLocalization/VCamResources/ja.lproj/Localizable.strings b/app/xcode/Sources/VCamLocalization/VCamResources/ja.lproj/Localizable.strings
@@ -103,6 +103,7 @@
 "deleteSelectedObject" = "選択中のオブジェクトを削除する";
 "interact" = "操作";
 "localFile" = "ローカルファイル";
+"setAsBackground" = "背景に設定する";
 
 "moveInitialPosition" = "カメラを初期位置に戻す";
 

diff --git a/app/xcode/Sources/VCamUI/Toolbar/VCamMainToolbar.swift b/app/xcode/Sources/VCamUI/Toolbar/VCamMainToolbar.swift
@@ -9,14 +9,14 @@ import SwiftUI
 import VCamEntity
 
 public struct VCamMainToolbar: View {
-    public init(photoPicker: VCamMainToolbarPhotoPicker, emojiPicker: VCamMainToolbarEmojiPicker, motionPicker: VCamMainToolbarMotionPicker, blendShapePicker: VCamMainToolbarBlendShapePicker) {
+    public init(photoPicker: VCamMainToolbarBackgroundColorPicker, emojiPicker: VCamMainToolbarEmojiPicker, motionPicker: VCamMainToolbarMotionPicker, blendShapePicker: VCamMainToolbarBlendShapePicker) {
         self.photoPicker = photoPicker
         self.emojiPicker = emojiPicker
         self.motionPicker = motionPicker
         self.blendShapePicker = blendShapePicker
     }
 
-    let photoPicker: VCamMainToolbarPhotoPicker
+    let photoPicker: VCamMainToolbarBackgroundColorPicker
     let emojiPicker: VCamMainToolbarEmojiPicker
     let motionPicker: VCamMainToolbarMotionPicker
     let blendShapePicker: VCamMainToolbarBlendShapePicker
@@ -34,7 +34,7 @@ public struct VCamMainToolbar: View {
             Item {
                 isPhotoPopover.toggle()
             } label: {
-                Image(systemName: "photo")
+                Image(systemName: "paintpalette.fill")
             }
             .popover(isPresented: $isPhotoPopover) {
                 VCamPopoverContainer(L10n.background.key) {
@@ -118,7 +118,7 @@ public struct VCamMainToolbar: View {
 struct VCamMainToolbar_Previews: PreviewProvider {
     static var previews: some View {
         VCamMainToolbar(
-            photoPicker: VCamMainToolbarPhotoPicker(backgroundColor: .constant(.red), loadBackgroundImage: { _ in }, removeBackgroundImage: {}),
+            photoPicker: VCamMainToolbarBackgroundColorPicker(backgroundColor: .constant(.red)),
             emojiPicker: VCamMainToolbarEmojiPicker(),
             motionPicker: VCamMainToolbarMotionPicker(motionHello: {}, motionBye: { .constant(false) }, motionJump: {}, motionYear: {}, motionWhat: {}, motionWin: {}, motionNod: { .constant(false) }, motionShakeHead: { .constant(false) }, motionShakeBody: { .constant(false) }, motionRun: { .constant(false) }),
             blendShapePicker: VCamMainToolbarBlendShapePicker(blendShapes: [], selectedBlendShape: { .constant(nil) })

diff --git a/app/xcode/Sources/VCamUI/Toolbar/VCamMainToolbarBackgroundColorPicker.swift b/app/xcode/Sources/VCamUI/Toolbar/VCamMainToolbarBackgroundColorPicker.swift
@@ -0,0 +1,36 @@
+//
+//  VCamMainToolbarBackgroundColorPicker.swift
+//  
+//
+//  Created by Tatsuya Tanaka on 2023/02/12.
+//
+
+import SwiftUI
+import VCamUIFoundation
+
+public struct VCamMainToolbarBackgroundColorPicker: View {
+    public init(backgroundColor: Binding<Color>) {
+        self._backgroundColor = backgroundColor
+    }
+
+    @Binding var backgroundColor: Color
+
+    public var body: some View {
+        GroupBox {
+            Form {
+                HStack {
+                    Text(L10n.color.key, bundle: .localize)
+                        .fixedSize(horizontal: true, vertical: false)
+                    ColorEditField(L10n.color.key, value: $backgroundColor)
+                        .labelsHidden()
+                }
+            }
+        }
+    }
+}
+
+struct VCamMainToolbarPhotoPicker_Previews: PreviewProvider {
+    static var previews: some View {
+        VCamMainToolbarBackgroundColorPicker(backgroundColor: .constant(.red))
+    }
+}
diff --git a/app/xcode/Sources/VCamUI/Toolbar/VCamMainToolbarPhotoPicker.swift b/app/xcode/Sources/VCamUI/Toolbar/VCamMainToolbarPhotoPicker.swift