summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordynaflash <[email protected]>2009-03-13 19:56:59 +0000
committerdynaflash <[email protected]>2009-03-13 19:56:59 +0000
commit30b537ed1847e996f74338bab2441e59c8c8d05f (patch)
tree6045b1a0b60c89a1dc3471dfa6d94900bed00a3d
parentf6ba5c266ebd17fccf9cbaf3af98db7074dfdbd4 (diff)
MacGui: setUsesThreadedAnimation to false for the progress indicators in the main window for 32 bit as well as 64 bit. also for fMovieCreationProgressIndicator in th preview window.
- For live preview this fixes an issue where the qtmovieview controller was not in focus. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2259 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--macosx/Controller.mm8
-rw-r--r--macosx/HBPreviewController.mm4
2 files changed, 9 insertions, 3 deletions
diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 5027a4687..36cd1b79c 100644
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -294,12 +294,14 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It
* 10.5 dev notes regarding this possiblility. It was also noted
* that unless specified, setUsesThreadedAnimation defaults to true.
* So, at least for now we set the indicator animation to NO for
- * both the scan and regular progress indicators.
+ * both the scan and regular progress indicators for both 32 and 64 bit
+ * as it test out fine on both and there is no reason our progress indicators
+ * should require their own thread.
*/
-#ifdef __LP64__
+
[fScanIndicator setUsesThreadedAnimation:NO];
[fRipIndicator setUsesThreadedAnimation:NO];
-#endif
+
/* Show/Dont Show Presets drawer upon launch based
diff --git a/macosx/HBPreviewController.mm b/macosx/HBPreviewController.mm
index cea2a1ee3..2e979d969 100644
--- a/macosx/HBPreviewController.mm
+++ b/macosx/HBPreviewController.mm
@@ -78,6 +78,10 @@
isFullScreen = NO;
hudTimerSeconds = 0;
+ /* we set the progress indicator to not use threaded animation
+ * as it causes a conflict with the qtmovieview's controllerbar
+ */
+ [fMovieCreationProgressIndicator setUsesThreadedAnimation:NO];
/* Setup our layers for core animation */
[fPictureViewArea setWantsLayer:YES];