Changeset 1202

Timestamp:

03/07/2010 03:14:22 PM (2 years ago)

Author:

gbooker

Message:

Use a timer to suppress the screen saver instead of disabling it. Also supresses the popups which are otherwise not disabled and cause crashes.

Location:

trunk/CommonMediaPlayer/General Actions

Files:

• CMPScreenReleaseAction.h (modified) (1 diff)
• CMPScreenReleaseAction.m (modified) (5 diffs)

trunk/CommonMediaPlayer/General Actions/CMPScreenReleaseAction.h

@@ -24 +24 @@
 @interface CMPScreenReleaseAction : NSObject <CMPActionController>{
         int             screensaverTimeout;
+        NSTimer *activityTimer;
 }
 

trunk/CommonMediaPlayer/General Actions/CMPScreenReleaseAction.m

@@ -203 +203 @@
 @implementation CMPScreenReleaseAction
 
+- (id)initWithController:(id <CMPPlayerController>)controller andSettings:(NSDictionary *)settings
+{
+        return [super init];
+}
+
+- (void)dealloc
+{
+        [activityTimer invalidate];
+        [super dealloc];
+}
+
+
 - (BOOL)releaseAllDisplaysWithoutFadeWithError:(NSError **)error
 { 
@@ -294 +306 @@
 }
 
-- (void)disableScreenSaver
-{
-        Class cls = NSClassFromString(@"ATVScreenSaverManager");
-        if(cls != nil)
-        {
-                Class cls2 = NSClassFromString(@"ATVSettingsFacade");
-                
-                screensaverTimeout = [[cls2 singleton] screenSaverTimeout];
-                [[cls2 singleton] setScreenSaverTimeout:-1];
-                [[cls singleton] _updateActivity:nil];
-        }
-        else if(cls == nil)
-        {
-                cls = NSClassFromString(@"BRScreenSaverManager");
-                if(cls != nil)
-                {
-                        screensaverTimeout = [[BRSettingsFacade settingsFacade] screenSaverTimeout];
-                        [[BRSettingsFacade settingsFacade] setScreenSaverTimeout:-1];
-                }
-        }
+- (void)activityTimerFire
+{
+        if([CMPATVVersion usingLeopard])
+                UpdateSystemActivity(UsrActivity);
+        [BRBackgroundTaskManager holdOffBackgroundTasks];
+        [[NSNotificationCenter defaultCenter] postNotificationName:@"BRUserActionNotification" object:nil];
 }
 
@@ -359 +357 @@
 }
 
-- (void)resetScreenSaver
-{
-        Class cls = NSClassFromString(@"ATVScreenSaverManager");
-        if(cls != nil)
-        {
-                Class cls2 = NSClassFromString(@"ATVSettingsFacade");
-                [[cls2 singleton] setScreenSaverTimeout:screensaverTimeout];
-                [[cls singleton] _updateActivity:nil];
-        }
-        else if(cls == nil)
-        {
-                cls = NSClassFromString(@"BRScreenSaverManager");
-                if(cls != nil)
-                {
-                        [[BRSettingsFacade settingsFacade] setScreenSaverTimeout:screensaverTimeout];
-                        [[cls sharedInstance] updateActivity];
-                }
-        } 
-}
-
-- (id)initWithController:(id <CMPPlayerController>)controller andSettings:(NSDictionary *)settings
-{
-        return [super init];
-}
-
 - (BOOL)openWithError:(NSError **)error
 {
@@ -394 +367 @@
         
         if(success)
-                [self disableScreenSaver];
+        {
+                [activityTimer invalidate];
+                activityTimer = [NSTimer scheduledTimerWithTimeInterval:24 target:self selector:@selector(activityTimerFire) userInfo:nil repeats:YES];
+                [self activityTimerFire];
+        }
         
         return success;
@@ -411 +388 @@
         }
         
-        [self resetScreenSaver];
+        [activityTimer invalidate];
+        activityTimer = nil;
         
         return YES;