diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6fdc6db
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,23 @@
+*.o
+*.lo
+*.la
+#*#
+.*.rej
+*.rej
+.*~
+*~
+.#*
+.DS_Store
+*~.nib
+*.pbxuser
+.xvpics
+build/*
+*.mode1
+*.mode1v3
+*.mode2v3
+*.perspectivev3
+.svn
+*/*/build/*
+*/*/Build/*
+*/*/*/build/*
+*/*/*/Build/*
diff --git a/Classes/MainViewController.h b/Classes/MainViewController.h
index b96c0b1..395cf3f 100644
--- a/Classes/MainViewController.h
+++ b/Classes/MainViewController.h
@@ -21,5 +21,5 @@
- (void)runTimer;
- (IBAction) toggleSafeMode: (id) sender;
- (IBAction) toggleVideoOutput: (id) sender;
-
+- (IBAction) implementationChanged: (id) sender;
@end
diff --git a/Classes/MainViewController.m b/Classes/MainViewController.m
index 422446a..dd7de0c 100644
--- a/Classes/MainViewController.m
+++ b/Classes/MainViewController.m
@@ -82,6 +82,33 @@ - (void)flipsideViewControllerDidFinish:(FlipsideViewController *)controller {
[self dismissModalViewControllerAnimated:YES];
}
+- (IBAction) implementationChanged: (id) sender
+{
+ UISegmentedControl *segmentedControl = (UISegmentedControl*) sender;
+
+ if(videoSwitch.on)
+ {
+ [[TVOutManager sharedInstance] stopTVOut];
+ }
+
+ if(segmentedControl.selectedSegmentIndex == 0)
+ {
+ [[TVOutManager sharedInstance] setImplementation:kTVOutImplementationMainThread];
+ }
+ else if(segmentedControl.selectedSegmentIndex == 1)
+ {
+ [[TVOutManager sharedInstance] setImplementation:kTVOutImplementationBackgroundThread];
+ }
+ else if(segmentedControl.selectedSegmentIndex == 2)
+ {
+ [[TVOutManager sharedInstance] setImplementation:kTVOutImplementationCADisplayLink];
+ }
+
+ if(videoSwitch.on)
+ {
+ [[TVOutManager sharedInstance] startTVOut];
+ }
+}
- (IBAction)showInfo:(id)sender {
diff --git a/MainView.xib b/MainView.xib
index a022459..9631752 100644
--- a/MainView.xib
+++ b/MainView.xib
@@ -1,18 +1,18 @@
- 1024
+ 800
10F569
- 788
+ 804
1038.29
461.00
+
{480, 300}
@@ -309,6 +370,15 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA
55
+
@@ -386,6 +458,16 @@ AAMAAAABAAEAAAFTAAMAAAAEAAACAgAAAAAACAAIAAgACAABAAEAAQABA
+
+
- 55
+ 58
diff --git a/MainView~ipad.xib b/MainView~ipad.xib
index 55e6090..4902c7b 100644
--- a/MainView~ipad.xib
+++ b/MainView~ipad.xib
@@ -1,14 +1,14 @@
- 1024
+ 800
10F569
- 788
+ 804
1038.29
461.00
+
+
+
- 52
+ 55
diff --git a/TVOutManager.h b/TVOutManager.h
index 935c132..0752301 100644
--- a/TVOutManager.h
+++ b/TVOutManager.h
@@ -8,9 +8,14 @@
#import
+typedef enum {
+ kTVOutImplementationMainThread = 0,
+ kTVOutImplementationBackgroundThread = 1,
+ kTVOutImplementationCADisplayLink = 2,
+}TVOutImplementation;
@interface TVOutManager : NSObject {
-
+ TVOutImplementation implementation;
UIWindow* deviceWindow;
UIWindow* tvoutWindow;
NSTimer *updateTimer;
@@ -22,7 +27,7 @@
}
@property(assign) BOOL tvSafeMode;
-
+@property(assign) TVOutImplementation implementation;
+ (TVOutManager *)sharedInstance;
diff --git a/TVOutManager.m b/TVOutManager.m
index 55b7847..91bc0b4 100644
--- a/TVOutManager.m
+++ b/TVOutManager.m
@@ -12,7 +12,6 @@
#import "TVOutManager.h"
#define kFPS 15
-#define kUseBackgroundThread NO
//
// Warning: once again, we can't use UIGetScreenImage for shipping apps (as of late July 2010)
@@ -20,13 +19,14 @@
// you may want to use it for non-app-store builds (i.e. private demo, trade show build, etc.)
// Just uncomment both lines below.
//
-// #define USE_UIGETSCREENIMAGE
-// CGImageRef UIGetScreenImage();
+//#define USE_UIGETSCREENIMAGE
+//CGImageRef UIGetScreenImage();
//
@implementation TVOutManager
@synthesize tvSafeMode;
+@synthesize implementation;
+ (TVOutManager *)sharedInstance
{
@@ -85,6 +85,23 @@ -(void) setTvSafeMode:(BOOL) val
tvSafeMode = val;
}
+- (void) setImplementation:(TVOutImplementation) theImplementation
+{
+ if(tvoutWindow && theImplementation != implementation)
+ {
+ NSLog(@"TVOutManager: TVOutManager Started. Can't change implementations while running.");
+ }
+ else
+ {
+ implementation = theImplementation;
+ }
+}
+
+- (TVOutImplementation) implementation
+{
+ return implementation;
+}
+
- (void) startTVOut
{
// you need to have a main window already open when you call start
@@ -154,15 +171,44 @@ - (void) startTVOut
[self updateTVOut];
- if (kUseBackgroundThread) [NSThread detachNewThreadSelector:@selector(updateLoop) toTarget:self withObject:nil];
- else {
+
+ if (self.implementation == kTVOutImplementationBackgroundThread)
+ {
+ [NSThread detachNewThreadSelector:@selector(updateLoop) toTarget:self withObject:nil];
+ }
+ else if(self.implementation == kTVOutImplementationMainThread)
+ {
updateTimer = [NSTimer scheduledTimerWithTimeInterval: (1.0/kFPS) target: self selector: @selector(updateTVOut) userInfo: nil repeats: YES];
[updateTimer retain];
}
-
+ else if(self.implementation == kTVOutImplementationCADisplayLink)
+ {
+ [self performSelectorInBackground:@selector(caDisplayLinkWorker) withObject:nil];
+ }
+ else {
+ NSLog(@"TVOutManager: Unknown implementation. Defaulting to kTVOutImplementationMainThread");
+ [NSThread detachNewThreadSelector:@selector(updateLoop) toTarget:self withObject:nil];
+ }
+
}
}
+- (void) caDisplayLinkWorker{
+ done = NO;
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc]init];
+ CADisplayLink *displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(updateTVOutForCADisplayLink)];
+ [displayLink setFrameInterval:(60 / kFPS)];
+ [displayLink addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSRunLoopCommonModes];
+ [displayLink retain];
+ while (!done) {
+ [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.5f]];
+ }
+ [displayLink invalidate];
+ [displayLink release];
+ displayLink = nil;
+ [pool release];
+}
+
- (void) stopTVOut;
{
done = YES;
@@ -176,6 +222,14 @@ - (void) stopTVOut;
}
}
+- (void) updateTVOutForCADisplayLink
+{
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+ [self updateTVOut];
+ [pool release];
+}
+
+
- (void) updateTVOut;
{
#ifdef USE_UIGETSCREENIMAGE
@@ -196,8 +250,16 @@ - (void) updateTVOut;
// following code to match Apple's sample at http://developer.apple.com/iphone/library/qa/qa2010/qa1704.html
// note that you'll need to pass in a reference to your eaglview to get that to work.
- UIGraphicsBeginImageContext(deviceWindow.bounds.size);
- CGContextRef context = UIGraphicsGetCurrentContext();
+ if(UIGraphicsBeginImageContextWithOptions != NULL)
+ {
+ UIGraphicsBeginImageContextWithOptions(deviceWindow.bounds.size, NO, 0);
+ }
+ else
+ {
+ UIGraphicsBeginImageContext(deviceWindow.bounds.size);
+ }
+
+ CGContextRef context = UIGraphicsGetCurrentContext();
// get every window's contents (i.e. so you can see alerts, ads, etc.)
for (UIWindow *window in [[UIApplication sharedApplication] windows])
diff --git a/TVOutOS4Test.xcodeproj/project.pbxproj b/TVOutOS4Test.xcodeproj/project.pbxproj
index dedb0b6..29fb229 100755
--- a/TVOutOS4Test.xcodeproj/project.pbxproj
+++ b/TVOutOS4Test.xcodeproj/project.pbxproj
@@ -20,6 +20,8 @@
D43BC3BA1218789F009FFC37 /* MainView~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = D43BC3B91218789F009FFC37 /* MainView~ipad.xib */; };
D4AD32AC1219CD530063D204 /* yellow-sun-iphone-wallpaper.jpg in Resources */ = {isa = PBXBuildFile; fileRef = D4AD32AB1219CD530063D204 /* yellow-sun-iphone-wallpaper.jpg */; };
D4EA1338121969A7003C084D /* TVOutManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D4EA1337121969A7003C084D /* TVOutManager.m */; };
+ E2E98B0812674C2F00464FC8 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2E98B0712674C2F00464FC8 /* QuartzCore.framework */; };
+ E2E98B831267595700464FC8 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2E98B821267595700464FC8 /* OpenGLES.framework */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
@@ -43,6 +45,8 @@
D4AD32AB1219CD530063D204 /* yellow-sun-iphone-wallpaper.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "yellow-sun-iphone-wallpaper.jpg"; sourceTree = ""; };
D4EA1336121969A7003C084D /* TVOutManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TVOutManager.h; sourceTree = ""; };
D4EA1337121969A7003C084D /* TVOutManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TVOutManager.m; sourceTree = ""; };
+ E2E98B0712674C2F00464FC8 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
+ E2E98B821267595700464FC8 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -53,6 +57,8 @@
1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */,
1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */,
288765590DF743DE002DB57D /* CoreGraphics.framework in Frameworks */,
+ E2E98B0812674C2F00464FC8 /* QuartzCore.framework in Frameworks */,
+ E2E98B831267595700464FC8 /* OpenGLES.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -139,6 +145,8 @@
1DF5F4DF0D08C38300B7A737 /* UIKit.framework */,
1D30AB110D05D00D00671497 /* Foundation.framework */,
288765580DF743DE002DB57D /* CoreGraphics.framework */,
+ E2E98B0712674C2F00464FC8 /* QuartzCore.framework */,
+ E2E98B821267595700464FC8 /* OpenGLES.framework */,
);
name = Frameworks;
sourceTree = "";
@@ -170,6 +178,7 @@
isa = PBXProject;
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "TVOutOS4Test" */;
compatibilityVersion = "Xcode 3.2";
+ developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
English,
@@ -249,14 +258,14 @@
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Rob Terrell (5R68LE6Q2B)";
+ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 3.2;
PREBINDING = NO;
- "PROVISIONING_PROFILE[sdk=iphoneos*]" = "604E3389-90D1-4D4E-A8CC-2BF66AED520B";
- SDKROOT = iphoneos4.0;
+ "PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
+ SDKROOT = iphoneos4.1;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
@@ -271,7 +280,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
PREBINDING = NO;
- SDKROOT = iphoneos4.0;
+ SDKROOT = iphoneos3.2;
};
name = Release;
};