From c9ba30b6921c1cea983dceb0b2e5e1efb77a37ce Mon Sep 17 00:00:00 2001 From: Thong Nguyen Date: Tue, 21 Jan 2014 15:48:12 +0000 Subject: [PATCH] Removed iOS7 specific calls. Changed default target to iOS 4.3 --- ExampleApp/ExampleApp.xcodeproj/project.pbxproj | 4 ++++ .../StreamingKit.xcodeproj/project.pbxproj | 8 ++++++-- .../StreamingKit/STKLocalFileDataSource.m | 16 +++++----------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/ExampleApp/ExampleApp.xcodeproj/project.pbxproj b/ExampleApp/ExampleApp.xcodeproj/project.pbxproj index b897340..a04c284 100644 --- a/ExampleApp/ExampleApp.xcodeproj/project.pbxproj +++ b/ExampleApp/ExampleApp.xcodeproj/project.pbxproj @@ -401,11 +401,13 @@ A111595E188D686000641365 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "ExampleApp/ExampleApp-Prefix.pch"; INFOPLIST_FILE = "ExampleApp/ExampleApp-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; }; @@ -414,11 +416,13 @@ A111595F188D686000641365 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "ExampleApp/ExampleApp-Prefix.pch"; INFOPLIST_FILE = "ExampleApp/ExampleApp-Info.plist"; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; PRODUCT_NAME = "$(TARGET_NAME)"; WRAPPER_EXTENSION = app; }; diff --git a/StreamingKit/StreamingKit.xcodeproj/project.pbxproj b/StreamingKit/StreamingKit.xcodeproj/project.pbxproj index e4c6dd1..39c6c85 100644 --- a/StreamingKit/StreamingKit.xcodeproj/project.pbxproj +++ b/StreamingKit/StreamingKit.xcodeproj/project.pbxproj @@ -325,7 +325,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 7.0; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; }; @@ -357,7 +357,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 7.0; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; }; @@ -366,6 +366,7 @@ A1E7C4EC188D57F60010896F /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; DSTROOT = /tmp/StreamingKit.dst; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -382,6 +383,7 @@ A1E7C4ED188D57F60010896F /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; DSTROOT = /tmp/StreamingKit.dst; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -452,6 +454,7 @@ A1E7C4ED188D57F60010896F /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; A1E7C4EE188D57F60010896F /* Build configuration list for PBXNativeTarget "StreamingKitTests" */ = { isa = XCConfigurationList; @@ -460,6 +463,7 @@ A1E7C4F0188D57F60010896F /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; diff --git a/StreamingKit/StreamingKit/STKLocalFileDataSource.m b/StreamingKit/StreamingKit/STKLocalFileDataSource.m index acee100..6f6934a 100644 --- a/StreamingKit/StreamingKit/STKLocalFileDataSource.m +++ b/StreamingKit/StreamingKit/STKLocalFileDataSource.m @@ -115,8 +115,6 @@ -(void) open { - NSURL* url = [[NSURL alloc] initFileURLWithPath:self.filePath]; - if (stream) { CFReadStreamClose(stream); @@ -125,16 +123,13 @@ stream = 0; } + NSURL* url = [[NSURL alloc] initFileURLWithPath:self.filePath]; + stream = CFReadStreamCreateWithFile(NULL, (__bridge CFURLRef)url); - NSError *fileError; - - NSFileManager *manager = [[NSFileManager alloc] init]; - - NSString *path = [NSString stringWithUTF8String:[url fileSystemRepresentation]]; - - NSDictionary *attributes = [manager attributesOfItemAtPath:path - error:&fileError]; + NSError* fileError; + NSFileManager* manager = [[NSFileManager alloc] init]; + NSDictionary* attributes = [manager attributesOfItemAtPath:filePath error:&fileError]; if (fileError) { @@ -145,7 +140,6 @@ } NSNumber* number = [attributes objectForKey:@"NSFileSize"]; - if (number) {