From 196fb6c044234b23caab9bc602ca070ae231d5fa Mon Sep 17 00:00:00 2001 From: Denis Kolyasev Date: Wed, 15 Jan 2020 12:52:52 +0300 Subject: [PATCH 1/3] Fix deadlock in SCRecordSession --- Library/Sources/SCRecordSession.m | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Library/Sources/SCRecordSession.m b/Library/Sources/SCRecordSession.m index 32aa3b3f..1d2cdb67 100644 --- a/Library/Sources/SCRecordSession.m +++ b/Library/Sources/SCRecordSession.m @@ -520,7 +520,9 @@ - (BOOL)endSegmentWithInfo:(NSDictionary *)info completionHandler:(void(^)(SCRec [writer endSessionAtSourceTime:CMTimeAdd(_currentSegmentDuration, _sessionStartTime)]; [writer finishWritingWithCompletionHandler: ^{ - [self appendRecordSegmentUrl:writer.outputURL info:info error:writer.error completionHandler:completionHandler]; + dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ + [self appendRecordSegmentUrl:writer.outputURL info:info error:writer.error completionHandler:completionHandler]; + }); }]; } } else { From 7c69dc04d3d2cbfff7eadcbd78613b1363026532 Mon Sep 17 00:00:00 2001 From: Denis Kolyasev Date: Wed, 15 Jan 2020 12:59:09 +0300 Subject: [PATCH 2/3] Bump version v2.7.0.2 --- SCRecorder.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SCRecorder.podspec b/SCRecorder.podspec index be66c3da..12ec1093 100644 --- a/SCRecorder.podspec +++ b/SCRecorder.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "SCRecorder" - s.version = "2.7.0.1" + s.version = "2.7.0.2" s.summary = "The camera engine that is complete, for real." s.description = <<-DESC @@ -12,7 +12,7 @@ Pod::Spec.new do |s| s.license = 'Apache License, Version 2.0' s.author = { "Simon CORSIN" => "simon@corsin.me" } s.platform = :ios, '7.0' - s.source = { :git => "https://github.com/bandlab/SCRecorder.git", :tag => "2.7.0.1" } + s.source = { :git => "https://github.com/bandlab/SCRecorder.git", :tag => "2.7.0.2" } s.source_files = 'Library/Sources/*.{h,m}' s.public_header_files = 'Library/Sources/*.h' s.requires_arc = true From b0fcdf999821596438ce2660b46bcf2262a2bab2 Mon Sep 17 00:00:00 2001 From: Nikolai Ishchuk Date: Thu, 20 Feb 2020 19:28:46 +0800 Subject: [PATCH 3/3] Update for carthage --- Library/SCRecorder.xcodeproj/project.pbxproj | 71 +++++++++++++++- .../xcschemes/SCRecorder.xcscheme | 80 +++++++++++++++++++ .../xcschemes/SCRecorderFramework.xcscheme | 80 +++++++++++++++++++ .../xcschemes/SCRecorderMac.xcscheme | 80 +++++++++++++++++++ Library/SCRecorderFramework/Info.plist | 2 +- .../SCRecorderFramework/SCRecorderFramework.h | 2 +- .../SCRecorderMac/SCRecorderMac-Info.plist | 2 +- Library/Sources/SCRecorder.h | 8 -- Library/Sources/SCRecorder.m | 1 + Library/Sources/SCRecorderHeader.h | 3 + 10 files changed, 315 insertions(+), 14 deletions(-) create mode 100644 Library/SCRecorder.xcodeproj/xcshareddata/xcschemes/SCRecorder.xcscheme create mode 100644 Library/SCRecorder.xcodeproj/xcshareddata/xcschemes/SCRecorderFramework.xcscheme create mode 100644 Library/SCRecorder.xcodeproj/xcshareddata/xcschemes/SCRecorderMac.xcscheme diff --git a/Library/SCRecorder.xcodeproj/project.pbxproj b/Library/SCRecorder.xcodeproj/project.pbxproj index 49dbba72..1c5288aa 100644 --- a/Library/SCRecorder.xcodeproj/project.pbxproj +++ b/Library/SCRecorder.xcodeproj/project.pbxproj @@ -121,6 +121,18 @@ DCEE378E1B17F3D50019C7B5 /* SCWeakSelectorTarget.m in Sources */ = {isa = PBXBuildFile; fileRef = DC10CF271ACFD458009880C4 /* SCWeakSelectorTarget.m */; }; DCEE378F1B17F3D50019C7B5 /* SCFilterAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = DC7A62BE1AFA47EC00EAB60C /* SCFilterAnimation.m */; }; DCF3A68F1AB9F4760034CF5C /* SCRecorderDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = DCF3A68E1AB9F4760034CF5C /* SCRecorderDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FD783A5C23FE9A5F00689167 /* SCIOPixelBuffers.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD12AA21B45AA540064674D /* SCIOPixelBuffers.h */; }; + FD783A5D23FE9A6700689167 /* SCIOPixelBuffers.m in Sources */ = {isa = PBXBuildFile; fileRef = DCD12AA31B45AA540064674D /* SCIOPixelBuffers.m */; }; + FD783A5E23FE9A7200689167 /* SCProcessingQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = DCD12A9D1B456C5E0064674D /* SCProcessingQueue.h */; }; + FD783A5F23FE9A7400689167 /* SCProcessingQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = DCD12A9E1B456C5E0064674D /* SCProcessingQueue.m */; }; + FD783A6023FE9BF300689167 /* SCContext.h in Headers */ = {isa = PBXBuildFile; fileRef = DCEE37881B17E6480019C7B5 /* SCContext.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FD783A6123FE9C1800689167 /* SCFilterAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = DC7A62BD1AFA47EC00EAB60C /* SCFilterAnimation.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FD783A6223FE9CEC00689167 /* SCRecorderHeader.h in Headers */ = {isa = PBXBuildFile; fileRef = 90B02E411BCC00AC00559011 /* SCRecorderHeader.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FD783A6323FE9D0600689167 /* SCFilterImageView.h in Headers */ = {isa = PBXBuildFile; fileRef = 90D4FBDD1BC6C1840017748D /* SCFilterImageView.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FD783A6423FE9D4000689167 /* NSURL+SCSaveToCameraRoll.h in Headers */ = {isa = PBXBuildFile; fileRef = 90B02E331BC995CD00559011 /* NSURL+SCSaveToCameraRoll.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FD783A6523FE9D6400689167 /* UIImage+SCSaveToCameraRoll.h in Headers */ = {isa = PBXBuildFile; fileRef = 90B02E3D1BCC003D00559011 /* UIImage+SCSaveToCameraRoll.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FD783A6623FE9D6B00689167 /* SCFilter+VideoComposition.h in Headers */ = {isa = PBXBuildFile; fileRef = 907931791BD2A06700D7D181 /* SCFilter+VideoComposition.h */; settings = {ATTRIBUTES = (Public, ); }; }; + FD783A6723FE9D7200689167 /* SCFilter+UIImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 9079317D1BD451C200D7D181 /* SCFilter+UIImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -548,21 +560,31 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( + FD783A6723FE9D7200689167 /* SCFilter+UIImage.h in Headers */, DCDC1DF81AC79592001DC3D9 /* SCRecorderFramework.h in Headers */, DCDC1E2E1AC799CF001DC3D9 /* SCVideoConfiguration.h in Headers */, DCDC1E2F1AC799CF001DC3D9 /* SCAudioConfiguration.h in Headers */, + FD783A6423FE9D4000689167 /* NSURL+SCSaveToCameraRoll.h in Headers */, + FD783A5E23FE9A7200689167 /* SCProcessingQueue.h in Headers */, DCDC1E301AC799CF001DC3D9 /* SCMediaTypeConfiguration.h in Headers */, DCDC1E311AC799CF001DC3D9 /* SCPhotoConfiguration.h in Headers */, DCDC1E321AC799CF001DC3D9 /* SCRecordSession.h in Headers */, DCDC1E331AC799CF001DC3D9 /* SCRecorder.h in Headers */, DCDC1E341AC799CF001DC3D9 /* SCRecordSessionSegment.h in Headers */, + FD783A6623FE9D6B00689167 /* SCFilter+VideoComposition.h in Headers */, DCDC1E351AC799CF001DC3D9 /* SCRecorderDelegate.h in Headers */, + FD783A6223FE9CEC00689167 /* SCRecorderHeader.h in Headers */, DCDC1E361AC799CF001DC3D9 /* SCRecorderFocusTargetView.h in Headers */, + FD783A5C23FE9A5F00689167 /* SCIOPixelBuffers.h in Headers */, DCDC1E371AC799CF001DC3D9 /* SCRecorderToolsView.h in Headers */, + FD783A6123FE9C1800689167 /* SCFilterAnimation.h in Headers */, + FD783A6523FE9D6400689167 /* UIImage+SCSaveToCameraRoll.h in Headers */, DCDC1E391AC799CF001DC3D9 /* SCSwipeableFilterView.h in Headers */, DCDC1E3C1AC799CF001DC3D9 /* SCImageView.h in Headers */, + FD783A6323FE9D0600689167 /* SCFilterImageView.h in Headers */, DCDC1E3D1AC799CF001DC3D9 /* SCPlayer.h in Headers */, DCDC1E3E1AC799CF001DC3D9 /* SCVideoPlayerView.h in Headers */, + FD783A6023FE9BF300689167 /* SCContext.h in Headers */, DCDC1E401AC799CF001DC3D9 /* SCSampleBufferHolder.h in Headers */, DCDC1E411AC799CF001DC3D9 /* SCAssetExportSession.h in Headers */, DCDC1E421AC799CF001DC3D9 /* SCAudioTools.h in Headers */, @@ -634,7 +656,7 @@ isa = PBXProject; attributes = { CLASSPREFIX = VR; - LastUpgradeCheck = 0620; + LastUpgradeCheck = 1030; ORGANIZATIONNAME = rFlex; TargetAttributes = { DCDC1DF21AC79592001DC3D9 = { @@ -743,10 +765,12 @@ DCDC1E1E1AC797EF001DC3D9 /* SCRecorderToolsView.m in Sources */, DCDC1E1F1AC797EF001DC3D9 /* SCSwipeableFilterView.m in Sources */, DCDC1E211AC797EF001DC3D9 /* SCImageView.m in Sources */, + FD783A5D23FE9A6700689167 /* SCIOPixelBuffers.m in Sources */, DCDC1E221AC797EF001DC3D9 /* SCPlayer.m in Sources */, DCDC1E231AC797EF001DC3D9 /* SCVideoPlayerView.m in Sources */, DCDC1E251AC797EF001DC3D9 /* SCSampleBufferHolder.m in Sources */, DCDC1E261AC797EF001DC3D9 /* SCAssetExportSession.m in Sources */, + FD783A5F23FE9A7400689167 /* SCProcessingQueue.m in Sources */, DCDC1E271AC797EF001DC3D9 /* SCAudioTools.m in Sources */, DCDC1E281AC797EF001DC3D9 /* SCRecorderTools.m in Sources */, DCDC1E291AC797EF001DC3D9 /* SCFilter.m in Sources */, @@ -801,34 +825,52 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_CXX0X_EXTENSIONS = YES; CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNKNOWN_PRAGMAS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; }; @@ -838,27 +880,44 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_CXX0X_EXTENSIONS = YES; CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNKNOWN_PRAGMAS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; @@ -895,6 +954,7 @@ INFOPLIST_FILE = "SCRecorderMac/SCRecorderMac-Info.plist"; LD_DYLIB_INSTALL_NAME = "@rpath/${EXECUTABLE_PATH}"; MACOSX_DEPLOYMENT_TARGET = 10.9; + PRODUCT_BUNDLE_IDENTIFIER = "me.corsin.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; WRAPPER_EXTENSION = framework; @@ -929,6 +989,7 @@ INFOPLIST_FILE = "SCRecorderMac/SCRecorderMac-Info.plist"; LD_DYLIB_INSTALL_NAME = "@rpath/${EXECUTABLE_PATH}"; MACOSX_DEPLOYMENT_TARGET = 10.9; + PRODUCT_BUNDLE_IDENTIFIER = "me.corsin.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; WRAPPER_EXTENSION = framework; @@ -944,6 +1005,7 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; + CODE_SIGN_IDENTITY = ""; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; @@ -965,6 +1027,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MODULEMAP_FILE = SCRecorderFramework/SCRecorder.modulemap; MTL_ENABLE_DEBUG_INFO = YES; + PRODUCT_BUNDLE_IDENTIFIER = "me.corsin.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = SCRecorder; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; @@ -982,6 +1045,7 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNREACHABLE_CODE = YES; + CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; @@ -1001,6 +1065,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MODULEMAP_FILE = SCRecorderFramework/SCRecorder.modulemap; MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_BUNDLE_IDENTIFIER = "me.corsin.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = SCRecorder; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/Library/SCRecorder.xcodeproj/xcshareddata/xcschemes/SCRecorder.xcscheme b/Library/SCRecorder.xcodeproj/xcshareddata/xcschemes/SCRecorder.xcscheme new file mode 100644 index 00000000..448ff93e --- /dev/null +++ b/Library/SCRecorder.xcodeproj/xcshareddata/xcschemes/SCRecorder.xcscheme @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Library/SCRecorder.xcodeproj/xcshareddata/xcschemes/SCRecorderFramework.xcscheme b/Library/SCRecorder.xcodeproj/xcshareddata/xcschemes/SCRecorderFramework.xcscheme new file mode 100644 index 00000000..f596fb9b --- /dev/null +++ b/Library/SCRecorder.xcodeproj/xcshareddata/xcschemes/SCRecorderFramework.xcscheme @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Library/SCRecorder.xcodeproj/xcshareddata/xcschemes/SCRecorderMac.xcscheme b/Library/SCRecorder.xcodeproj/xcshareddata/xcschemes/SCRecorderMac.xcscheme new file mode 100644 index 00000000..b83646dd --- /dev/null +++ b/Library/SCRecorder.xcodeproj/xcshareddata/xcschemes/SCRecorderMac.xcscheme @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Library/SCRecorderFramework/Info.plist b/Library/SCRecorderFramework/Info.plist index fa2dffe4..d3de8eef 100644 --- a/Library/SCRecorderFramework/Info.plist +++ b/Library/SCRecorderFramework/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - me.corsin.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/Library/SCRecorderFramework/SCRecorderFramework.h b/Library/SCRecorderFramework/SCRecorderFramework.h index 41619034..27e3c6bf 100644 --- a/Library/SCRecorderFramework/SCRecorderFramework.h +++ b/Library/SCRecorderFramework/SCRecorderFramework.h @@ -16,4 +16,4 @@ FOUNDATION_EXPORT const unsigned char SCRecorderFrameworkVersionString[]; // In this header, you should import all the public headers of your framework using statements like #import -#import \ No newline at end of file +#import diff --git a/Library/SCRecorderMac/SCRecorderMac-Info.plist b/Library/SCRecorderMac/SCRecorderMac-Info.plist index 72404aee..e63e701e 100644 --- a/Library/SCRecorderMac/SCRecorderMac-Info.plist +++ b/Library/SCRecorderMac/SCRecorderMac-Info.plist @@ -9,7 +9,7 @@ CFBundleIconFile CFBundleIdentifier - me.corsin.${PRODUCT_NAME:rfc1034identifier} + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/Library/Sources/SCRecorder.h b/Library/Sources/SCRecorder.h index 8f80c3e6..50d85708 100644 --- a/Library/Sources/SCRecorder.h +++ b/Library/Sources/SCRecorder.h @@ -18,9 +18,6 @@ #import "SCRecorderTools.h" #import "SCRecorderDelegate.h" -// Convenience -#import "SCRecorderHeader.h" - @interface SCRecorder : NSObject /** @@ -262,11 +259,6 @@ */ @property (readonly, nonatomic) AVCaptureAudioDataOutput *__nullable audioOutput; -/** - The underlying AVCaptureStillImageOutput - */ -@property (readonly, nonatomic) AVCaptureStillImageOutput *__nullable photoOutput; - /** The dispatch queue that the SCRecorder uses for sending messages to the attached SCRecordSession. diff --git a/Library/Sources/SCRecorder.m b/Library/Sources/SCRecorder.m index c1f8c970..1f9f2697 100644 --- a/Library/Sources/SCRecorder.m +++ b/Library/Sources/SCRecorder.m @@ -7,6 +7,7 @@ // #import "SCRecorder.h" +#import "SCSampleBufferHolder.h" #import "SCRecordSession_Internal.h" #define dispatch_handler(x) if (x != nil) dispatch_async(dispatch_get_main_queue(), x) #define kSCRecorderRecordSessionQueueKey "SCRecorderRecordSessionQueue" diff --git a/Library/Sources/SCRecorderHeader.h b/Library/Sources/SCRecorderHeader.h index de6e539c..2ad031e5 100644 --- a/Library/Sources/SCRecorderHeader.h +++ b/Library/Sources/SCRecorderHeader.h @@ -25,3 +25,6 @@ #import "UIImage+SCSaveToCameraRoll.h" #import "SCFilter+VideoComposition.h" #import "SCFilter+UIImage.h" +#import "SCAudioTools.h" +#import "SCSampleBufferHolder.h" +#import "SCRecorderFocusTargetView.h"