support suppressing automatic display link activation

owenv · May 8, 2014 · 88a74e3 · 88a74e3
1 parent 462a48f
commit 88a74e3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/pop.xcodeproj/project.pbxproj b/pop.xcodeproj/project.pbxproj
@@ -1186,7 +1186,6 @@
 				GCC_PREFIX_HEADER = "$(PRODUCT_NAME)/$(PRODUCT_NAME)-Prefix.pch";
 				INFOPLIST_FILE = "POP/pop-Info.plist";
 				PRODUCT_NAME = pop;
-				PUBLIC_HEADERS_FOLDER_PATH = ../Headers/POP;
 			};
 			name = Debug;
 		};
@@ -1201,7 +1200,6 @@
 				GCC_PREFIX_HEADER = "$(PRODUCT_NAME)/$(PRODUCT_NAME)-Prefix.pch";
 				INFOPLIST_FILE = "POP/pop-Info.plist";
 				PRODUCT_NAME = pop;
-				PUBLIC_HEADERS_FOLDER_PATH = ../Headers/POP;
 			};
 			name = GCOV;
 		};
@@ -1216,7 +1214,6 @@
 				GCC_PREFIX_HEADER = "$(PRODUCT_NAME)/$(PRODUCT_NAME)-Prefix.pch";
 				INFOPLIST_FILE = "POP/pop-Info.plist";
 				PRODUCT_NAME = pop;
-				PUBLIC_HEADERS_FOLDER_PATH = ../Headers/POP;
 			};
 			name = Release;
 		};
@@ -1231,7 +1228,6 @@
 				GCC_PREFIX_HEADER = "$(PRODUCT_NAME)/$(PRODUCT_NAME)-Prefix.pch";
 				INFOPLIST_FILE = "POP/pop-Info.plist";
 				PRODUCT_NAME = pop;
-				PUBLIC_HEADERS_FOLDER_PATH = ../Headers/POP;
 			};
 			name = Profile;
 		};

diff --git a/pop/POPAnimator.mm b/pop/POPAnimator.mm
@@ -88,6 +88,7 @@ @interface POPAnimator ()
   CFTimeInterval _slowMotionLastTime;
   CFTimeInterval _slowMotionAccumulator;
   OSSpinLock _lock;
+  BOOL _disableDisplayLink;
 }
 @end
 
@@ -110,7 +111,7 @@ static CVReturn displayLinkCallback(CVDisplayLinkRef displayLink, const CVTimeSt
 // call while holding lock
 static void updateDisplayLink(POPAnimator *self)
 {
-  BOOL paused = 0 == self->_observers.count && self->_list.empty();
+  BOOL paused = (0 == self->_observers.count && self->_list.empty()) || self->_disableDisplayLink;
 
 #if TARGET_OS_IPHONE
   if (paused != self->_displayLink.paused) {

diff --git a/pop/POPAnimatorPrivate.h b/pop/POPAnimatorPrivate.h
@@ -31,6 +31,11 @@
 + (void)setDisableBackgroundThread:(BOOL)flag;
 #endif
 
+/**
+ Used for externally driven animator instances.
+ */
+@property (assign, nonatomic) BOOL disableDisplayLink;
+
 /**
  Exposed for unit testing.
  */