fix 编译问题

chenliming · chenliming · commit d30aecc80230 · 2016-08-31T13:34:06.000+08:00
diff --git a/FrameWork/Info.plist b/FrameWork/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.4.1</string>
+	<string>2.2.4.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/LFLiveKit.podspec b/LFLiveKit.podspec
@@ -2,7 +2,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "LFLiveKit"
-  s.version      = "2.2.4.1"
+  s.version      = "2.2.4.2"
   s.summary      = "LaiFeng ios Live. LFLiveKit."
   s.homepage     = "https://github.com/chenliming777"
   s.license      = { :type => "MIT", :file => "LICENSE" }
diff --git a/LFLiveKit/LFLiveKit.h b/LFLiveKit/LFLiveKit.h
@@ -6,6 +6,16 @@
 //  Copyright © 2016年 admin. All rights reserved.
 //
 
+#if __has_include(<LFLiveKit/LFLiveKit.h>)
+#import <LFLiveKit/LFLiveSession.h>
+#import <LFLiveKit/LFLiveAudioConfiguration.h>
+#import <LFLiveKit/LFLiveVideoConfiguration.h>
+#import <LFLiveKit/LFAudioFrame.h>
+#import <LFLiveKit/LFFrame.h>
+#import <LFLiveKit/LFLiveStreamInfo.h>
+#import <LFLiveKit/LFVideoFrame.h>
+#import <LFLiveKit/LFLiveDebug.h>
+#else
 #import "LFLiveSession.h"
 #import "LFLiveAudioConfiguration.h"
 #import "LFLiveVideoConfiguration.h"
@@ -14,12 +24,5 @@
 #import "LFLiveStreamInfo.h"
 #import "LFVideoFrame.h"
 #import "LFLiveDebug.h"
+#endif
 
-//#import <LFLiveKit/LFLiveSession.h>
-//#import <LFLiveKit/LFLiveAudioConfiguration.h>
-//#import <LFLiveKit/LFLiveVideoConfiguration.h>
-//#import <LFLiveKit/LFAudioFrame.h>
-//#import <LFLiveKit/LFFrame.h>
-//#import <LFLiveKit/LFLiveStreamInfo.h>
-//#import <LFLiveKit/LFVideoFrame.h>
-//#import <LFLiveKit/LFLiveDebug.h>
diff --git a/LFLiveKit/LFLiveSession.h b/LFLiveKit/LFLiveSession.h
@@ -8,12 +8,11 @@
 
 #import <Foundation/Foundation.h>
 #import <AVFoundation/AVFoundation.h>
-#import "LFLiveStreamInfo.h"
-#import "LFAudioFrame.h"
-#import "LFVideoFrame.h"
-#import "LFLiveAudioConfiguration.h"
-#import "LFLiveVideoConfiguration.h"
-#import "LFLiveDebug.h"
+#if __has_include(<LFLiveKit/LFLiveKit.h>)
+#import <LFLiveKit/LFLiveKit.h>
+#else
+#import "LFLiveKit"
+#endif
 
 typedef NS_ENUM(NSInteger,LFLiveCaptureType) {
     LFLiveCaptureAudio,         //< capture only audio
diff --git a/LFLiveKit/capture/LFAudioCapture.h b/LFLiveKit/capture/LFAudioCapture.h
@@ -8,7 +8,12 @@
 
 #import <Foundation/Foundation.h>
 #import <AVFoundation/AVFoundation.h>
+
+#if __has_include(<LFLiveKit/LFLiveKit.h>)
+#import <LFLiveKit/LFLiveAudioConfiguration.h>
+#else
 #import "LFLiveAudioConfiguration.h"
+#endif
 
 #pragma mark -- AudioCaptureNotification
 /** compoentFialed will post the notification */
diff --git a/LFLiveKit/capture/LFVideoCapture.h b/LFLiveKit/capture/LFVideoCapture.h
@@ -8,7 +8,12 @@
 
 #import <Foundation/Foundation.h>
 #import <AVFoundation/AVFoundation.h>
+
+#if __has_include(<LFLiveKit/LFLiveKit.h>)
+#import <LFLiveKit/LFLiveVideoConfiguration.h>
+#else
 #import "LFLiveVideoConfiguration.h"
+#endif
 
 @class LFVideoCapture;
 /** LFVideoCapture callback videoData */
diff --git a/LFLiveKit/coder/H264/LFAVEncoder.h b/LFLiveKit/coder/H264/LFAVEncoder.h
@@ -11,9 +11,17 @@
 #import <AVFoundation/AVAssetWriterInput.h>
 #import <AVFoundation/AVMediaFormat.h>
 #import <AVFoundation/AVVideoSettings.h>
-#import "sys/stat.h"
+#import <sys/stat.h>
+
+#if __has_include(<LFLiveKit/LFLiveKit.h>)
+#import <LFLiveKit/LFVideoEncoder.h>
+#import <LFLiveKit/LFMP4Atom.h>
+#else
 #import "LFVideoEncoder.h"
 #import "LFMP4Atom.h"
+#endif
+
+
 
 typedef int (^encoder_handler_t)(NSArray *data, CMTimeValue ptsValue);
 typedef int (^param_handler_t)(NSData *params);
diff --git a/LFLiveKit/coder/H264/LFVideoEncoder.h b/LFLiveKit/coder/H264/LFVideoEncoder.h
@@ -7,10 +7,10 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "AVFoundation/AVAssetWriter.h"
-#import "AVFoundation/AVAssetWriterInput.h"
-#import "AVFoundation/AVMediaFormat.h"
-#import "AVFoundation/AVVideoSettings.h"
+#import <AVFoundation/AVAssetWriter.h>
+#import <AVFoundation/AVAssetWriterInput.h>
+#import <AVFoundation/AVMediaFormat.h>
+#import <AVFoundation/AVVideoSettings.h>
 
 @interface LFVideoEncoder : NSObject
 
diff --git a/LFLiveKit/coder/LFAudioEncoding.h b/LFLiveKit/coder/LFAudioEncoding.h
@@ -8,8 +8,15 @@
 
 #import <Foundation/Foundation.h>
 #import <AVFoundation/AVFoundation.h>
+#if __has_include(<LFLiveKit/LFLiveKit.h>)
+#import <LFLiveKit/LFAudioFrame.h>
+#import <LFLiveKit/LFLiveAudioConfiguration.h>
+#else
 #import "LFAudioFrame.h"
 #import "LFLiveAudioConfiguration.h"
+#endif
+
+
 
 @protocol LFAudioEncoding;
 /// 编码器编码后回调
diff --git a/LFLiveKit/coder/LFH264VideoEncoder.h b/LFLiveKit/coder/LFH264VideoEncoder.h
@@ -5,7 +5,12 @@
 //  Created by feng on 7/5/16.
 //  Copyright (c) 2014 zhanqi.tv. All rights reserved.
 //
+
+#if __has_include(<LFLiveKit/LFLiveKit.h>)
+#import <LFLiveKit/LFVideoEncoding.h>
+#else
 #import "LFVideoEncoding.h"
+#endif
 
 @interface LFH264VideoEncoder : NSObject <LFVideoEncoding> {
  
diff --git a/LFLiveKit/coder/LFHardwareAudioEncoder.h b/LFLiveKit/coder/LFHardwareAudioEncoder.h
@@ -6,7 +6,11 @@
 //  Copyright © 2016年 倾慕. All rights reserved.
 //
 
+#if __has_include(<LFLiveKit/LFLiveKit.h>)
+#import <LFLiveKit/LFAudioEncoding.h>
+#else
 #import "LFAudioEncoding.h"
+#endif
 
 @interface LFHardwareAudioEncoder : NSObject<LFAudioEncoding>
 
diff --git a/LFLiveKit/coder/LFHardwareVideoEncoder.h b/LFLiveKit/coder/LFHardwareVideoEncoder.h
@@ -6,7 +6,11 @@
 //  Copyright © 2016年 倾慕. All rights reserved.
 //
 
+#if __has_include(<LFLiveKit/LFLiveKit.h>)
+#import <LFLiveKit/LFVideoEncoding.h>
+#else
 #import "LFVideoEncoding.h"
+#endif
 
 @interface LFHardwareVideoEncoder : NSObject<LFVideoEncoding>
 
diff --git a/LFLiveKit/coder/LFVideoEncoding.h b/LFLiveKit/coder/LFVideoEncoding.h
@@ -7,8 +7,15 @@
 //
 
 #import <Foundation/Foundation.h>
+
+#if __has_include(<LFLiveKit/LFLiveKit.h>)
+#import <LFLiveKit/LFVideoFrame.h>
+#import <LFLiveKit/LFLiveVideoConfiguration.h>
+#else
 #import "LFVideoFrame.h"
 #import "LFLiveVideoConfiguration.h"
+#endif
+
 
 @protocol LFVideoEncoding;
 /// 编码器编码后回调
diff --git a/LFLiveKit/objects/LFAudioFrame.h b/LFLiveKit/objects/LFAudioFrame.h
@@ -6,7 +6,11 @@
 //  Copyright © 2016年 倾慕. All rights reserved.
 //
 
+#if __has_include(<LFLiveKit/LFLiveKit.h>)
+#import <LFLiveKit/LFFrame.h>
+#else
 #import "LFFrame.h"
+#endif
 
 @interface LFAudioFrame : LFFrame
 
diff --git a/LFLiveKit/objects/LFLiveStreamInfo.h b/LFLiveKit/objects/LFLiveStreamInfo.h
@@ -7,8 +7,16 @@
 //  真正的上传地址 token等
 
 #import <Foundation/Foundation.h>
+
+#if __has_include(<LFLiveKit/LFLiveKit.h>)
+#import <LFLiveKit/LFLiveAudioConfiguration.h>
+#import <LFLiveKit/LFLiveVideoConfiguration.h>
+#else
 #import "LFLiveAudioConfiguration.h"
 #import "LFLiveVideoConfiguration.h"
+#endif
+
+
 
 /// 流状态
 typedef NS_ENUM (NSUInteger, LFLiveState){
diff --git a/LFLiveKit/objects/LFVideoFrame.h b/LFLiveKit/objects/LFVideoFrame.h
@@ -6,7 +6,12 @@
 //  Copyright © 2016年 倾慕. All rights reserved.
 //
 
+#if __has_include(<LFLiveKit/LFLiveKit.h>)
+#import <LFLiveKit/LFFrame.h>
+#else
 #import "LFFrame.h"
+#endif
+
 
 @interface LFVideoFrame : LFFrame
 
diff --git a/LFLiveKit/publish/LFStreamRTMPSocket.h b/LFLiveKit/publish/LFStreamRTMPSocket.h
@@ -6,7 +6,11 @@
 //  Copyright © 2016年 live Interactive. All rights reserved.
 //
 
+#if __has_include(<LFLiveKit/LFLiveKit.h>)
+#import <LFLiveKit/LFStreamSocket.h>
+#else
 #import "LFStreamSocket.h"
+#endif
 
 @interface LFStreamRTMPSocket : NSObject<LFStreamSocket>
 
diff --git a/LFLiveKit/publish/LFStreamSocket.h b/LFLiveKit/publish/LFStreamSocket.h
@@ -7,9 +7,18 @@
 //
 
 #import <Foundation/Foundation.h>
+
+#if __has_include(<LFLiveKit/LFLiveKit.h>)
+#import <LFLiveKit/LFLiveStreamInfo.h>
+#import <LFLiveKit/LFStreamingBuffer.h>
+#import <LFLiveKit/LFLiveDebug.h>
+#else
 #import "LFLiveStreamInfo.h"
 #import "LFStreamingBuffer.h"
 #import "LFLiveDebug.h"
+#endif
+
+
 
 @protocol LFStreamSocket;
 @protocol LFStreamSocketDelegate <NSObject>
diff --git a/LFLiveKit/publish/LFStreamingBuffer.h b/LFLiveKit/publish/LFStreamingBuffer.h
@@ -7,8 +7,15 @@
 //
 
 #import <Foundation/Foundation.h>
+
+#if __has_include(<LFLiveKit/LFLiveKit.h>)
+#import <LFLiveKit/LFAudioFrame.h>
+#import <LFLiveKit/LFVideoFrame.h>
+#else
 #import "LFAudioFrame.h"
 #import "LFVideoFrame.h"
+#endif
+
 
 /** current buffer status */
 typedef NS_ENUM (NSUInteger, LFLiveBuffferState) {
