![(please configure the [header_logo] section in trac.ini)](/repos/chrome/site/pj.jpg)
Changeset 4813
- Timestamp:
- Apr 8, 2014 9:43:01 AM (11 years ago)
- Location:
- pjproject/trunk/pjsip-apps/src/pjsua
- Files:
-
- 6 edited
-
ios/ipjsua.xcodeproj/project.pbxproj (modified) (11 diffs)
-
ios/ipjsua/ipjsuaAppDelegate.h (modified) (1 diff)
-
ios/ipjsua/ipjsuaAppDelegate.m (modified) (4 diffs)
-
ios/ipjsua/ipjsuaViewController.h (modified) (1 diff)
-
ios/ipjsua/ipjsuaViewController.m (modified) (1 diff)
-
pjsua_app.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/pjsip-apps/src/pjsua/ios/ipjsua.xcodeproj/project.pbxproj
r4799 r4813 8 8 9 9 /* Begin PBXBuildFile section */ 10 3A92068F16F1DE7100D49F96 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A92068E16F1DE7100D49F96 /* AudioToolbox.framework */; }; 11 3A92069316F1DEA500D49F96 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A92069216F1DEA500D49F96 /* CFNetwork.framework */; }; 10 3A7E649018E9A60700C00CB6 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A7E648B18E9A60700C00CB6 /* libswscale.a */; }; 11 3A7E649118E9A60700C00CB6 /* libavformat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A7E648C18E9A60700C00CB6 /* libavformat.a */; }; 12 3A7E649218E9A60700C00CB6 /* libavresample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A7E648D18E9A60700C00CB6 /* libavresample.a */; }; 13 3A7E649318E9A60700C00CB6 /* libavfilter.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A7E648E18E9A60700C00CB6 /* libavfilter.a */; }; 14 3A7E649618E9A91400C00CB6 /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A7E649518E9A91400C00CB6 /* libavutil.a */; }; 15 3A7E649A18E9A94100C00CB6 /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A7E649918E9A94100C00CB6 /* libavcodec.a */; }; 16 3A7E649C18E9A95500C00CB6 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A7E649B18E9A95500C00CB6 /* libz.dylib */; }; 17 3AA31FF618F3FB4C00112C3D /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AA31FE918F3FB4C00112C3D /* AudioToolbox.framework */; }; 18 3AA31FF718F3FB4C00112C3D /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AA31FEA18F3FB4C00112C3D /* AVFoundation.framework */; }; 19 3AA31FF818F3FB4C00112C3D /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AA31FEB18F3FB4C00112C3D /* CFNetwork.framework */; }; 20 3AA31FF918F3FB4C00112C3D /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AA31FEC18F3FB4C00112C3D /* CoreAudio.framework */; }; 21 3AA31FFA18F3FB4C00112C3D /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AA31FED18F3FB4C00112C3D /* CoreFoundation.framework */; }; 22 3AA31FFB18F3FB4C00112C3D /* CoreImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AA31FEE18F3FB4C00112C3D /* CoreImage.framework */; }; 23 3AA31FFC18F3FB4C00112C3D /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AA31FEF18F3FB4C00112C3D /* CoreMedia.framework */; }; 24 3AA31FFD18F3FB4C00112C3D /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AA31FF018F3FB4C00112C3D /* CoreVideo.framework */; }; 25 3AA31FFE18F3FB4C00112C3D /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AA31FF118F3FB4C00112C3D /* OpenGLES.framework */; }; 26 3AA31FFF18F3FB4C00112C3D /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AA31FF218F3FB4C00112C3D /* QuartzCore.framework */; }; 27 3AA3200018F3FB4C00112C3D /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AA31FF318F3FB4C00112C3D /* Foundation.framework */; }; 28 3AA3200118F3FB4C00112C3D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AA31FF418F3FB4C00112C3D /* CoreGraphics.framework */; }; 29 3AA3200218F3FB4C00112C3D /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AA31FF518F3FB4C00112C3D /* UIKit.framework */; }; 12 30 3ADCCD171715338D0007BE8E /* pjsua.png in Resources */ = {isa = PBXBuildFile; fileRef = 3ADCCD161715338D0007BE8E /* pjsua.png */; }; 13 31 3ADCCD2D172E40120007BE8E /* pjsua_app_cli.c in Sources */ = {isa = PBXBuildFile; fileRef = 3ADCCD28172E40120007BE8E /* pjsua_app_cli.c */; }; … … 16 34 3ADCCD30172E40120007BE8E /* pjsua_app_legacy.c in Sources */ = {isa = PBXBuildFile; fileRef = 3ADCCD2B172E40120007BE8E /* pjsua_app_legacy.c */; }; 17 35 3ADCCD31172E40120007BE8E /* pjsua_app.c in Sources */ = {isa = PBXBuildFile; fileRef = 3ADCCD2C172E40120007BE8E /* pjsua_app.c */; }; 18 3ADFCCFD1803B00600B0A097 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3ADFCCFC1803B00600B0A097 /* AVFoundation.framework */; };19 3AF0580916F050770046B835 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AF0580816F050770046B835 /* UIKit.framework */; };20 3AF0580B16F050770046B835 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AF0580A16F050770046B835 /* Foundation.framework */; };21 3AF0580D16F050770046B835 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AF0580C16F050770046B835 /* CoreGraphics.framework */; };22 36 3AF0581316F050780046B835 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3AF0581116F050780046B835 /* InfoPlist.strings */; }; 23 37 3AF0581516F050780046B835 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 3AF0581416F050780046B835 /* main.m */; }; … … 50 64 51 65 /* Begin PBXFileReference section */ 52 3A92068E16F1DE7100D49F96 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; 53 3A92069216F1DEA500D49F96 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; }; 66 3A7E648B18E9A60700C00CB6 /* libswscale.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libswscale.a; path = "../../../../../video/ffmpeg-iphone/build/built/armv7/lib/libswscale.a"; sourceTree = "<group>"; }; 67 3A7E648C18E9A60700C00CB6 /* libavformat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavformat.a; path = "../../../../../video/ffmpeg-iphone/build/built/armv7/lib/libavformat.a"; sourceTree = "<group>"; }; 68 3A7E648D18E9A60700C00CB6 /* libavresample.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavresample.a; path = "../../../../../video/ffmpeg-iphone/build/built/armv7/lib/libavresample.a"; sourceTree = "<group>"; }; 69 3A7E648E18E9A60700C00CB6 /* libavfilter.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavfilter.a; path = "../../../../../video/ffmpeg-iphone/build/built/armv7/lib/libavfilter.a"; sourceTree = "<group>"; }; 70 3A7E648F18E9A60700C00CB6 /* libavdevice.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavdevice.a; path = "../../../../../video/ffmpeg-iphone/build/built/armv7/lib/libavdevice.a"; sourceTree = "<group>"; }; 71 3A7E649518E9A91400C00CB6 /* libavutil.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavutil.a; path = "../../../../../video/ffmpeg-iphone/build/built/armv7/lib/libavutil.a"; sourceTree = "<group>"; }; 72 3A7E649918E9A94100C00CB6 /* libavcodec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavcodec.a; path = "../../../../../video/ffmpeg-iphone/build/built/armv7/lib/libavcodec.a"; sourceTree = "<group>"; }; 73 3A7E649B18E9A95500C00CB6 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; 74 3AA31FE918F3FB4C00112C3D /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; 75 3AA31FEA18F3FB4C00112C3D /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; 76 3AA31FEB18F3FB4C00112C3D /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; }; 77 3AA31FEC18F3FB4C00112C3D /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; 78 3AA31FED18F3FB4C00112C3D /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; }; 79 3AA31FEE18F3FB4C00112C3D /* CoreImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreImage.framework; path = System/Library/Frameworks/CoreImage.framework; sourceTree = SDKROOT; }; 80 3AA31FEF18F3FB4C00112C3D /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; 81 3AA31FF018F3FB4C00112C3D /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; }; 82 3AA31FF118F3FB4C00112C3D /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; 83 3AA31FF218F3FB4C00112C3D /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; 84 3AA31FF318F3FB4C00112C3D /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 85 3AA31FF418F3FB4C00112C3D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; 86 3AA31FF518F3FB4C00112C3D /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 54 87 3ADCCD161715338D0007BE8E /* pjsua.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = pjsua.png; sourceTree = "<group>"; }; 55 88 3ADCCD28172E40120007BE8E /* pjsua_app_cli.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pjsua_app_cli.c; path = ../../pjsua_app_cli.c; sourceTree = "<group>"; }; … … 58 91 3ADCCD2B172E40120007BE8E /* pjsua_app_legacy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pjsua_app_legacy.c; path = ../../pjsua_app_legacy.c; sourceTree = "<group>"; }; 59 92 3ADCCD2C172E40120007BE8E /* pjsua_app.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pjsua_app.c; path = ../../pjsua_app.c; sourceTree = "<group>"; }; 60 3ADFCCFC1803B00600B0A097 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };61 93 3AF0580416F050770046B835 /* ipjsua.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ipjsua.app; sourceTree = BUILT_PRODUCTS_DIR; }; 62 3AF0580816F050770046B835 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };63 3AF0580A16F050770046B835 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };64 3AF0580C16F050770046B835 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };65 94 3AF0581016F050780046B835 /* ipjsua-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "ipjsua-Info.plist"; sourceTree = "<group>"; }; 66 95 3AF0581216F050780046B835 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; }; … … 101 130 buildActionMask = 2147483647; 102 131 files = ( 103 3ADFCCFD1803B00600B0A097 /* AVFoundation.framework in Frameworks */, 104 3A92069316F1DEA500D49F96 /* CFNetwork.framework in Frameworks */, 105 3A92068F16F1DE7100D49F96 /* AudioToolbox.framework in Frameworks */, 106 3AF0580916F050770046B835 /* UIKit.framework in Frameworks */, 107 3AF0580B16F050770046B835 /* Foundation.framework in Frameworks */, 108 3AF0580D16F050770046B835 /* CoreGraphics.framework in Frameworks */, 132 3A7E649318E9A60700C00CB6 /* libavfilter.a in Frameworks */, 133 3A7E649118E9A60700C00CB6 /* libavformat.a in Frameworks */, 134 3AA31FF818F3FB4C00112C3D /* CFNetwork.framework in Frameworks */, 109 135 3AF0583716F057740046B835 /* libpj-arm-apple-darwin9.a in Frameworks */, 110 136 3AF0583916F057890046B835 /* libpjlib-util-arm-apple-darwin9.a in Frameworks */, 111 137 3AF0583F16F057B20046B835 /* libpjmedia-arm-apple-darwin9.a in Frameworks */, 138 3AA31FFB18F3FB4C00112C3D /* CoreImage.framework in Frameworks */, 139 3AA31FF618F3FB4C00112C3D /* AudioToolbox.framework in Frameworks */, 112 140 3AF0584016F057B30046B835 /* libpjmedia-audiodev-arm-apple-darwin9.a in Frameworks */, 141 3A7E649218E9A60700C00CB6 /* libavresample.a in Frameworks */, 113 142 3AF0584116F057B30046B835 /* libpjmedia-codec-arm-apple-darwin9.a in Frameworks */, 114 143 3AF0584216F057B30046B835 /* libpjmedia-videodev-arm-apple-darwin9.a in Frameworks */, 115 144 3AF0584316F057B30046B835 /* libpjsdp-arm-apple-darwin9.a in Frameworks */, 145 3AA31FF718F3FB4C00112C3D /* AVFoundation.framework in Frameworks */, 116 146 3AF0584516F057D30046B835 /* libpjnath-arm-apple-darwin9.a in Frameworks */, 147 3AA31FFE18F3FB4C00112C3D /* OpenGLES.framework in Frameworks */, 148 3A7E649618E9A91400C00CB6 /* libavutil.a in Frameworks */, 117 149 3AF0584A16F057F70046B835 /* libpjsip-arm-apple-darwin9.a in Frameworks */, 150 3A7E649C18E9A95500C00CB6 /* libz.dylib in Frameworks */, 151 3AA3200018F3FB4C00112C3D /* Foundation.framework in Frameworks */, 152 3AA3200118F3FB4C00112C3D /* CoreGraphics.framework in Frameworks */, 118 153 3AF0584B16F057F70046B835 /* libpjsip-simple-arm-apple-darwin9.a in Frameworks */, 154 3AA31FF918F3FB4C00112C3D /* CoreAudio.framework in Frameworks */, 155 3AA31FFD18F3FB4C00112C3D /* CoreVideo.framework in Frameworks */, 119 156 3AF0584C16F057F70046B835 /* libpjsip-ua-arm-apple-darwin9.a in Frameworks */, 157 3AA3200218F3FB4C00112C3D /* UIKit.framework in Frameworks */, 158 3AA31FFA18F3FB4C00112C3D /* CoreFoundation.framework in Frameworks */, 120 159 3AF0584D16F057F70046B835 /* libpjsua-arm-apple-darwin9.a in Frameworks */, 160 3A7E649018E9A60700C00CB6 /* libswscale.a in Frameworks */, 161 3AA31FFC18F3FB4C00112C3D /* CoreMedia.framework in Frameworks */, 162 3A7E649A18E9A94100C00CB6 /* libavcodec.a in Frameworks */, 121 163 3AF0585516F058290046B835 /* libg7221codec-arm-apple-darwin9.a in Frameworks */, 122 164 3AF0585616F058290046B835 /* libgsmcodec-arm-apple-darwin9.a in Frameworks */, 165 3AA31FFF18F3FB4C00112C3D /* QuartzCore.framework in Frameworks */, 123 166 3AF0585716F058290046B835 /* libilbccodec-arm-apple-darwin9.a in Frameworks */, 124 167 3AF0585916F058290046B835 /* libresample-arm-apple-darwin9.a in Frameworks */, … … 164 207 isa = PBXGroup; 165 208 children = ( 166 3ADFCCFC1803B00600B0A097 /* AVFoundation.framework */, 167 3A92069216F1DEA500D49F96 /* CFNetwork.framework */, 168 3A92068E16F1DE7100D49F96 /* AudioToolbox.framework */, 169 3AF0580816F050770046B835 /* UIKit.framework */, 170 3AF0580A16F050770046B835 /* Foundation.framework */, 171 3AF0580C16F050770046B835 /* CoreGraphics.framework */, 209 3AA31FE918F3FB4C00112C3D /* AudioToolbox.framework */, 210 3AA31FEA18F3FB4C00112C3D /* AVFoundation.framework */, 211 3AA31FEB18F3FB4C00112C3D /* CFNetwork.framework */, 212 3AA31FEC18F3FB4C00112C3D /* CoreAudio.framework */, 213 3AA31FED18F3FB4C00112C3D /* CoreFoundation.framework */, 214 3AA31FEE18F3FB4C00112C3D /* CoreImage.framework */, 215 3AA31FEF18F3FB4C00112C3D /* CoreMedia.framework */, 216 3AA31FF018F3FB4C00112C3D /* CoreVideo.framework */, 217 3AA31FF118F3FB4C00112C3D /* OpenGLES.framework */, 218 3AA31FF218F3FB4C00112C3D /* QuartzCore.framework */, 219 3AA31FF318F3FB4C00112C3D /* Foundation.framework */, 220 3AA31FF418F3FB4C00112C3D /* CoreGraphics.framework */, 221 3AA31FF518F3FB4C00112C3D /* UIKit.framework */, 172 222 ); 173 223 name = Frameworks; … … 207 257 isa = PBXGroup; 208 258 children = ( 259 3A7E649B18E9A95500C00CB6 /* libz.dylib */, 260 3A7E649918E9A94100C00CB6 /* libavcodec.a */, 261 3A7E649518E9A91400C00CB6 /* libavutil.a */, 262 3A7E648B18E9A60700C00CB6 /* libswscale.a */, 263 3A7E648C18E9A60700C00CB6 /* libavformat.a */, 264 3A7E648D18E9A60700C00CB6 /* libavresample.a */, 265 3A7E648E18E9A60700C00CB6 /* libavfilter.a */, 266 3A7E648F18E9A60700C00CB6 /* libavdevice.a */, 209 267 3AF0584E16F058290046B835 /* libg7221codec-arm-apple-darwin9.a */, 210 268 3AF0584F16F058290046B835 /* libgsmcodec-arm-apple-darwin9.a */, … … 411 469 LIBRARY_SEARCH_PATHS = ( 412 470 "$(inherited)", 413 " \"$(SRCROOT)\"",471 "$(SRCROOT)", 414 472 "\"$(SRCROOT)/../../../../pjlib/lib\"", 415 473 "\"$(SRCROOT)/../../../../pjlib-util/lib\"", … … 418 476 "\"$(SRCROOT)/../../../../pjsip/lib\"", 419 477 "\"$(SRCROOT)/../../../../third_party/lib\"", 478 "../../../../../video/ffmpeg-iphone/build/built/armv7/lib", 420 479 ); 421 480 ONLY_ACTIVE_ARCH = YES; … … 446 505 LIBRARY_SEARCH_PATHS = ( 447 506 "$(inherited)", 448 " \"$(SRCROOT)\"",507 "$(SRCROOT)", 449 508 "\"$(SRCROOT)/../../../../pjlib/lib\"", 450 509 "\"$(SRCROOT)/../../../../pjlib-util/lib\"", … … 453 512 "\"$(SRCROOT)/../../../../pjsip/lib\"", 454 513 "\"$(SRCROOT)/../../../../third_party/lib\"", 514 "../../../../../video/ffmpeg-iphone/build/built/armv7/lib", 455 515 ); 456 516 ONLY_ACTIVE_ARCH = YES; -
pjproject/trunk/pjsip-apps/src/pjsua/ios/ipjsua/ipjsuaAppDelegate.h
r4464 r4813 2 2 // ipjsuaAppDelegate.h 3 3 // ipjsua 4 // 5 // Created by Liong Sauw Ming on 13/3/13. 6 // Copyright (c) 2013 Teluu. All rights reserved. 7 // 8 4 /* 5 * Copyright (C) 2013-2014 Teluu Inc. (http://www.teluu.com) 6 * 7 * This program is free software; you can redistribute it and/or modify 8 * it under the terms of the GNU General Public License as published by 9 * the Free Software Foundation; either version 2 of the License, or 10 * (at your option) any later version. 11 * 12 * This program is distributed in the hope that it will be useful, 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * GNU General Public License for more details. 16 * 17 * You should have received a copy of the GNU General Public License 18 * along with this program; if not, write to the Free Software 19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 20 */ 9 21 #import <UIKit/UIKit.h> 10 22 -
pjproject/trunk/pjsip-apps/src/pjsua/ios/ipjsua/ipjsuaAppDelegate.m
r4590 r4813 2 2 // ipjsuaAppDelegate.m 3 3 // ipjsua 4 // 5 // Created by Liong Sauw Ming on 13/3/13. 6 // Copyright (c) 2013 Teluu. All rights reserved. 7 // 8 4 /* 5 * Copyright (C) 2013-2014 Teluu Inc. (http://www.teluu.com) 6 * 7 * This program is free software; you can redistribute it and/or modify 8 * it under the terms of the GNU General Public License as published by 9 * the Free Software Foundation; either version 2 of the License, or 10 * (at your option) any later version. 11 * 12 * This program is distributed in the hope that it will be useful, 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * GNU General Public License for more details. 16 * 17 * You should have received a copy of the GNU General Public License 18 * along with this program; if not, write to the Free Software 19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 20 */ 9 21 #import "ipjsuaAppDelegate.h" 10 22 #import <pjlib.h> … … 34 46 { 35 47 NSString *str = [NSString stringWithFormat:@"%s", msg]; 36 [app performSelectorOnMainThread:@selector(displayMsg:) withObject:str37 waitUntilDone:NO];48 dispatch_async(dispatch_get_main_queue(), 49 ^{app.viewController.textLabel.text = str;}); 38 50 } 39 51 … … 72 84 { 73 85 PJ_UNUSED_ARG(cfg); 74 }75 76 - (void)displayMsg:(NSString *)str77 {78 app.viewController.textLabel.text = str;79 86 } 80 87 … … 216 223 } 217 224 225 void displayWindow(pjsua_vid_win_id wid) 226 { 227 #if PJSUA_HAS_VIDEO 228 pjsua_vid_win_info wi; 229 230 if (wid != PJSUA_INVALID_ID && 231 pjsua_vid_win_get_info(wid, &wi) == PJ_SUCCESS) 232 { 233 UIView *view = (__bridge UIView *)wi.hwnd.info.ios.window; 234 if (view) { 235 dispatch_async(dispatch_get_main_queue(), ^{ 236 UIView *parent = app.viewController.view; 237 /* Add the video window as subview */ 238 [parent addSubview:view]; 239 /* Center it */ 240 view.center = CGPointMake(parent.bounds.size.width/2.0, 241 parent.bounds.size.height/2.0); 242 }); 243 } 244 } 245 #endif 246 } 247 218 248 @end -
pjproject/trunk/pjsip-apps/src/pjsua/ios/ipjsua/ipjsuaViewController.h
r4464 r4813 2 2 // ipjsuaViewController.h 3 3 // ipjsua 4 // 5 // Created by Liong Sauw Ming on 13/3/13. 6 // Copyright (c) 2013 Teluu. All rights reserved. 7 // 8 4 /* 5 * Copyright (C) 2013-2014 Teluu Inc. (http://www.teluu.com) 6 * 7 * This program is free software; you can redistribute it and/or modify 8 * it under the terms of the GNU General Public License as published by 9 * the Free Software Foundation; either version 2 of the License, or 10 * (at your option) any later version. 11 * 12 * This program is distributed in the hope that it will be useful, 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * GNU General Public License for more details. 16 * 17 * You should have received a copy of the GNU General Public License 18 * along with this program; if not, write to the Free Software 19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 20 */ 9 21 #import <UIKit/UIKit.h> 10 22 -
pjproject/trunk/pjsip-apps/src/pjsua/ios/ipjsua/ipjsuaViewController.m
r4464 r4813 2 2 // ipjsuaViewController.m 3 3 // ipjsua 4 // 5 // Created by Liong Sauw Ming on 13/3/13. 6 // Copyright (c) 2013 Teluu. All rights reserved. 7 // 8 4 /* 5 * Copyright (C) 2013-2014 Teluu Inc. (http://www.teluu.com) 6 * 7 * This program is free software; you can redistribute it and/or modify 8 * it under the terms of the GNU General Public License as published by 9 * the Free Software Foundation; either version 2 of the License, or 10 * (at your option) any later version. 11 * 12 * This program is distributed in the hope that it will be useful, 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * GNU General Public License for more details. 16 * 17 * You should have received a copy of the GNU General Public License 18 * along with this program; if not, write to the Free Software 19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 20 */ 9 21 #import "ipjsuaViewController.h" 10 22 -
pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c
r4724 r4813 552 552 553 553 arrange_window(ci->media[mi].stream.vid.win_in); 554 #ifdef USE_GUI 555 displayWindow(ci->media[mi].stream.vid.win_in); 556 #endif 554 557 555 558 PJ_UNUSED_ARG(has_error);
Note: See TracChangeset
for help on using the changeset viewer.
