Changeset 1289

Timestamp:

06/24/10 10:05:53 (2 years ago)

Author:

gbooker

Message:

Overlays no longer need an NSWindow, the window number is sufficient.

Location:

trunk/CommonMediaPlayer

Files:

• General Actions/CMPOverlayAction.h (modified) (1 diff)
• General Actions/CMPOverlayAction.m (modified) (10 diffs)
• Media Players/DVD Framework/CMPDVDWindowCreationAction.m (modified) (3 diffs)

trunk/CommonMediaPlayer/General Actions/CMPOverlayAction.h

@@ -77 +77 @@
 @end
 
-extern NSString *CMPOverlayActionWindowKey;
+extern NSString *CMPOverlayActionWindowNumberKey;
+extern NSString *CMPOverlayActionWindowRectKey;
 
 @interface CMPOverlayAction : NSObject <CMPActionController>{
-        NSWindow                                *window;
+        NSRect                                  windowRect;
+        int                                             windowNumber;
         NSMutableArray                  *overlays;
 }

trunk/CommonMediaPlayer/General Actions/CMPOverlayAction.m

@@ -22 +22 @@
 #import "CMPOverlayAction.h"
 #import "CoreGraphicsServices.h"
-#import "CMPOverlayModeAction.h"
 #import "CMPATVVersion.h"
 
@@ -568 +567 @@
 @end
 
-NSString *CMPOverlayActionWindowKey = @"window";
+NSString *CMPOverlayActionNumberKey = @"windowNumber";
+NSString *CMPOverlayActionRectKey = @"windowNumber";
 
 @interface BRDisplayManager (compat)
@@ -578 +578 @@
 - (id)initWithController:(id <CMPPlayerController>)controller andSettings:(NSDictionary *)settings
 {
-        NSWindow *win = [settings objectForKey:CMPOverlayActionWindowKey];
-        if(win == nil)
+        NSNumber *windowNum = [settings objectForKey:CMPOverlayActionWindowNumberKey];
+        if(windowNum == nil)
                 return [self autorelease];
         
@@ -586 +586 @@
                 return self;
         
-        window = [win retain];
+        windowNumber = [windowNum intValue];
+        NSValue *windowRectValue = [settings objectForKey:CMPOverlayActionWindowRectKey];
+        if(windowRectValue != nil)
+                windowRect = [windowRectValue rectValue];
+        else {
+                CGDirectDisplayID display = [(BRDisplayManager *)[BRDisplayManager sharedInstance] display];
+                CGRect frame = CGDisplayBounds(display);
+                frame.size.width = CGDisplayPixelsWide(display);
+                frame.size.height = CGDisplayPixelsHigh(display);
+                
+                if(frame.size.width < 0.0f)
+                        frame.size.width = ABS(frame.size.width);
+                if(frame.size.height < 0.0f)
+                        frame.size.height = ABS(frame.size.height);
+                
+                windowRect = NSMakeRect(frame.origin.x, frame.origin.y, frame.size.width, frame.size.height);           
+        }
         overlays = [[NSMutableArray alloc] init];
         
@@ -594 +610 @@
 - (void) dealloc
 {
-        [window release];
         [overlays release];
         [super dealloc];
@@ -606 +621 @@
 - (CMPOverlayWindow *)addBlackShieldWindow
 {
-        CMPOverlayWindow *ret = [[CMPOverlayWindow alloc] initWithContentRect:[window frame] overWindow:[window windowNumber]];
+        CMPOverlayWindow *ret = [[CMPOverlayWindow alloc] initWithContentRect:windowRect overWindow:windowNumber];
         
         [overlays addObject:ret];
@@ -616 +631 @@
 - (CMPTextView *)addTextOverlayInPosition:(CMPOverlayPosition)position
 {
-        CMPTextView *ret = [[CMPTextView alloc] initWithContentRect:[window frame] position:position overWindow:[window windowNumber]];
+        CMPTextView *ret = [[CMPTextView alloc] initWithContentRect:windowRect position:position overWindow:windowNumber];
         
         [overlays addObject:ret];
@@ -626 +641 @@
 - (CMPPlayerPlayHead *)addPlayheadOverlay
 {
-        CMPPlayerPlayHead *ret = [[CMPPlayerPlayHead alloc] initWithContentRect:[window frame] overWindow:[window windowNumber]];
+        CMPPlayerPlayHead *ret = [[CMPPlayerPlayHead alloc] initWithContentRect:windowRect overWindow:windowNumber];
         
         [overlays addObject:ret];
@@ -636 +651 @@
 - (CMPBlurredMenu *)addBlurredMenuOverlayWithItems:(NSArray *)items
 {
-        CMPBlurredMenu *ret = [[CMPBlurredMenu alloc] initWithItems:items contentRect:[window frame] overWindow:[window windowNumber]];
+        CMPBlurredMenu *ret = [[CMPBlurredMenu alloc] initWithItems:items contentRect:windowRect overWindow:windowNumber];
         
         [overlays addObject:ret];
@@ -673 +688 @@
 {
         [self closeAllOverlays];
-        [window close];
         return YES;
 }

trunk/CommonMediaPlayer/Media Players/DVD Framework/CMPDVDWindowCreationAction.m

@@ -25 +25 @@
 #import "CMPScreenReleaseAction.h"
 #import "CoreGraphicsServices.h"
-#import "CMPOverlayModeAction.h"
 #import "CMPATVVersion.h"
 #import "CMPDVDPlayer.h"
@@ -42 +41 @@
                 return self;
         
-//      screenRelease = [[CMPOverlayModeAction alloc] initWithController:controller andSettings:settings];
         screenRelease = [[CMPScreenReleaseAction alloc] initWithController:controller andSettings:settings];
         
@@ -123 +121 @@
     CGContextRelease(ctx);
         
-        overlayAction = [[CMPOverlayAction alloc] initWithController:nil andSettings:[NSDictionary dictionaryWithObjectsAndKeys:dvdWindow, CMPOverlayActionWindowKey, nil]];
+        overlayAction = [[CMPOverlayAction alloc] initWithController:nil andSettings:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithInt:[dvdWindow windowNumber]], CMPOverlayActionWindowNumberKey, [NSValue valueWithRect:[dvdWindow frame]], CMPOverlayActionWindowRectKey, nil]];
         [overlayAction openWithError:nil];