Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Features/add custom name for tmp video #240

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Features/add custom name for tmp video #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8da3cf9
add editable auth request title & message
Nov 25, 2020
d396487
naming changes
Nov 25, 2020
d0d5cb4
fix
Jan 13, 2021
058018b
Merge pull request #1 from VJosan/feature/fix-audio-playing-in-speakers
VJosan Jan 13, 2021
eba66ff
add customName for video
Jan 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 29 additions & 7 deletions Source/SwiftyCamViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ open class SwiftyCamViewController: UIViewController {
}

// MARK: Public Variable Declarations



/// Public Camera Delegate for the Custom View Controller Subclass

public weak var cameraDelegate: SwiftyCamViewControllerDelegate?
Expand Down Expand Up @@ -231,6 +232,12 @@ open class SwiftyCamViewController: UIViewController {

// MARK: Private Variable Declarations

/// Variable for auth

fileprivate var authTitle = "AVCam"
fileprivate var authMessage = NSLocalizedString("AVCam doesn't have permission to use the camera, please change privacy settings", comment: "Alert message when the user has denied access to the camera")


/// Variable for storing current zoom scale

fileprivate var zoomScale = CGFloat(1.0)
Expand Down Expand Up @@ -475,6 +482,21 @@ open class SwiftyCamViewController: UIViewController {

// MARK: Public Functions

/**

Set auth title & message

*/

public func setCamAuthTitle(_ title: String) {
authTitle = title
}

public func setCamAuthMessage(_ message: String) {
authMessage = message
}


/**

Capture photo from current session
Expand Down Expand Up @@ -508,7 +530,7 @@ open class SwiftyCamViewController: UIViewController {

*/

public func startVideoRecording() {
public func startVideoRecording(withFileName: String? = nil) {

guard sessionRunning == true else {
print("[SwiftyCam]: Cannot start video recoding. Capture session is not running")
Expand Down Expand Up @@ -550,7 +572,7 @@ open class SwiftyCamViewController: UIViewController {
movieFileOutputConnection?.videoOrientation = self.orientation.getVideoOrientation() ?? previewOrientation

// Start recording to a temporary file.
let outputFileName = UUID().uuidString
let outputFileName = withFileName ?? UUID().uuidString
let outputFilePath = (self.outputFolder as NSString).appendingPathComponent((outputFileName as NSString).appendingPathExtension("mov")!)
movieFileOutput.startRecording(to: URL(fileURLWithPath: outputFilePath), recordingDelegate: self)
self.isVideoRecording = true
Expand Down Expand Up @@ -870,8 +892,8 @@ open class SwiftyCamViewController: UIViewController {
// prompt User with UIAlertView

DispatchQueue.main.async(execute: { [unowned self] in
let message = NSLocalizedString("AVCam doesn't have permission to use the camera, please change privacy settings", comment: "Alert message when the user has denied access to the camera")
let alertController = UIAlertController(title: "AVCam", message: message, preferredStyle: .alert)

let alertController = UIAlertController(title: authTitle, message: authMessage, preferredStyle: .alert)
alertController.addAction(UIAlertAction(title: NSLocalizedString("OK", comment: "Alert OK button"), style: .cancel, handler: nil))
alertController.addAction(UIAlertAction(title: NSLocalizedString("Settings", comment: "Alert button to open Settings"), style: .default, handler: { action in
if #available(iOS 10.0, *) {
Expand Down Expand Up @@ -1013,9 +1035,9 @@ fileprivate func changeFlashSettings(device: AVCaptureDevice, mode: FlashMode) {

do{
if #available(iOS 10.0, *) {
try AVAudioSession.sharedInstance().setCategory(.playAndRecord, mode: .default, options: [.mixWithOthers, .allowBluetooth, .allowAirPlay, .allowBluetoothA2DP])
try AVAudioSession.sharedInstance().setCategory(.playAndRecord, mode: .default, options: [.mixWithOthers, .allowBluetooth, .allowAirPlay, .allowBluetoothA2DP, .defaultToSpeaker])
} else {
let options: [AVAudioSession.CategoryOptions] = [.mixWithOthers, .allowBluetooth]
let options: [AVAudioSession.CategoryOptions] = [.mixWithOthers, .allowBluetooth, .defaultToSpeaker]
let category = AVAudioSession.Category.playAndRecord
let selector = NSSelectorFromString("setCategory:withOptions:error:")
AVAudioSession.sharedInstance().perform(selector, with: category, with: options)
Expand Down
2 changes: 1 addition & 1 deletion SwiftyCam.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

Pod::Spec.new do |s|
s.name = 'SwiftyCam'
s.version = '4.0.0'
s.version = '4.0.2'
s.summary = 'A Simple, Snapchat inspired camera Framework written in Swift'
s.ios.deployment_target = '8.0'
s.swift_version = '4.2'
Expand Down