diff --git a/apps/projectGenerator b/apps/projectGenerator index 0d8b8d2707c..ad9a4d5b780 160000 --- a/apps/projectGenerator +++ b/apps/projectGenerator @@ -1 +1 @@ -Subproject commit 0d8b8d2707cf16c805f5c40d42b9308227a6d54f +Subproject commit ad9a4d5b7807b22814f5429c1310c34c90f243d9 diff --git a/libs/openFrameworksCompiled/project/ios/iOS+OFLib.xcodeproj/project.pbxproj b/libs/openFrameworksCompiled/project/ios/iOS+OFLib.xcodeproj/project.pbxproj index 83e77df6723..3352aff14cc 100644 --- a/libs/openFrameworksCompiled/project/ios/iOS+OFLib.xcodeproj/project.pbxproj +++ b/libs/openFrameworksCompiled/project/ios/iOS+OFLib.xcodeproj/project.pbxproj @@ -9,6 +9,8 @@ /* Begin PBXBuildFile section */ 035324612BEFEF5D00B50A35 /* ofTimerFps.h in Headers */ = {isa = PBXBuildFile; fileRef = 0353245F2BEFEF5D00B50A35 /* ofTimerFps.h */; }; 035324622BEFEF5D00B50A35 /* ofTimerFps.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 035324602BEFEF5D00B50A35 /* ofTimerFps.cpp */; }; + 037DF6522D77C8CE00BFFD5D /* AVFoundationVideoPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 037DF6512D77C8CE00BFFD5D /* AVFoundationVideoPlayer.m */; }; + 037DF6532D77C8CE00BFFD5D /* AVFoundationVideoPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 037DF6502D77C8CE00BFFD5D /* AVFoundationVideoPlayer.h */; }; 15594F0C15C55AC900727FF2 /* EAGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = 15594F0515C55AC900727FF2 /* EAGLView.m */; }; 15594F0D15C55AC900727FF2 /* ES1Renderer.m in Sources */ = {isa = PBXBuildFile; fileRef = 15594F0615C55AC900727FF2 /* ES1Renderer.m */; }; 15594F0E15C55AC900727FF2 /* ES2Renderer.m in Sources */ = {isa = PBXBuildFile; fileRef = 15594F0715C55AC900727FF2 /* ES2Renderer.m */; }; @@ -250,6 +252,8 @@ /* Begin PBXFileReference section */ 0353245F2BEFEF5D00B50A35 /* ofTimerFps.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofTimerFps.h; sourceTree = ""; }; 035324602BEFEF5D00B50A35 /* ofTimerFps.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofTimerFps.cpp; sourceTree = ""; }; + 037DF6502D77C8CE00BFFD5D /* AVFoundationVideoPlayer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AVFoundationVideoPlayer.h; sourceTree = ""; }; + 037DF6512D77C8CE00BFFD5D /* AVFoundationVideoPlayer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AVFoundationVideoPlayer.m; sourceTree = ""; }; 15594F0515C55AC900727FF2 /* EAGLView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EAGLView.m; sourceTree = ""; }; 15594F0615C55AC900727FF2 /* ES1Renderer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ES1Renderer.m; sourceTree = ""; }; 15594F0715C55AC900727FF2 /* ES2Renderer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ES2Renderer.m; sourceTree = ""; }; @@ -631,6 +635,8 @@ children = ( 15594FA115C56BB700727FF2 /* AVFoundationVideoGrabber.h */, 15594F9F15C56BB700727FF2 /* AVFoundationVideoGrabber.mm */, + 037DF6502D77C8CE00BFFD5D /* AVFoundationVideoPlayer.h */, + 037DF6512D77C8CE00BFFD5D /* AVFoundationVideoPlayer.m */, 1594366315CF5F420087B684 /* ofxiOSVideoPlayer.h */, 1594366115CF5F420087B684 /* ofxiOSVideoPlayer.mm */, 1594366215CF5F420087B684 /* ofxiOSVideoGrabber.h */, @@ -1112,6 +1118,7 @@ 15594FC515C56D1E00727FF2 /* ofxiOSCoreLocation.h in Headers */, 15594FC615C56D1E00727FF2 /* ofxiOSExternalDisplay.h in Headers */, 15594FC715C56D1E00727FF2 /* ofxiOSExtras.h in Headers */, + 037DF6532D77C8CE00BFFD5D /* AVFoundationVideoPlayer.h in Headers */, 15594FC815C56D1E00727FF2 /* ofxiOSImagePicker.h in Headers */, 15594FC915C56D1E00727FF2 /* ofxiOSKeyboard.h in Headers */, 15594FCA15C56D1E00727FF2 /* ofxiOSMapKit.h in Headers */, @@ -1297,6 +1304,7 @@ 678C3D26176F04F800D1CC68 /* ofxiOSSoundStreamDelegate.mm in Sources */, 678C3D28176F04F800D1CC68 /* SoundInputStream.m in Sources */, 678C3D2A176F04F800D1CC68 /* SoundOutputStream.m in Sources */, + 037DF6522D77C8CE00BFFD5D /* AVFoundationVideoPlayer.m in Sources */, 678C3D2C176F04F800D1CC68 /* SoundStream.m in Sources */, 671C0AF51770246200DF03B3 /* AVSoundPlayer.m in Sources */, 671C0AF71770246200DF03B3 /* ofxiOSSoundPlayer.mm in Sources */,