Changeset 1286

Timestamp:

06/22/10 18:27:49 (2 years ago)

Author:

gbooker

Message:

Made overlays more generic (just need an NSWindow now), not just for DVDs. Could be made even more generic later if necessary.
Increased update time in playhead making it more useful in fast forward.
Fixed crasher in SL
Fixed results from static analyzer.

Location:

trunk/CommonMediaPlayer

Files:

• Classes/CMPDefines.h (modified) (1 diff)
• Classes/CMPPlayerManager.m (modified) (3 diffs)
• CommonMediaPlayer.xcodeproj/project.pbxproj (modified) (5 diffs)
• General Actions/CMPOverlayAction.h (copied) (copied from trunk/CommonMediaPlayer/Media Players/DVD Framework/CMPDVDWindowCreationAction.h) (5 diffs)
• General Actions/CMPOverlayAction.m (copied) (copied from trunk/CommonMediaPlayer/Media Players/DVD Framework/CMPDVDWindowCreationAction.m) (25 diffs)
• Media Players/DVD Framework/CMPDVDPlayer.h (modified) (3 diffs)
• Media Players/DVD Framework/CMPDVDPlayer.m (modified) (7 diffs)
• Media Players/DVD Framework/CMPDVDPlayerController.h (modified) (3 diffs)
• Media Players/DVD Framework/CMPDVDPlayerController.m (modified) (13 diffs)
• Media Players/DVD Framework/CMPDVDWindowCreationAction.h (modified) (1 diff)
• Media Players/DVD Framework/CMPDVDWindowCreationAction.m (modified) (6 diffs)

trunk/CommonMediaPlayer/Classes/CMPDefines.h

@@ -22 +22 @@
 //Note, only defines should ever be in this file!
 
-#define CMPVersion 9  //Full Version Number
+#define CMPVersion 10  //Full Version Number
 #define CMPAPIVersion 1 //API version 1

trunk/CommonMediaPlayer/Classes/CMPPlayerManager.m

@@ -36 +36 @@
 + (CMPPlayerManager *)sharedPlayerManager
 {
-        CMPPlayerManager *shared = nil;
+        static CMPPlayerManager *shared = nil;
         if(shared == nil)
                 shared = [[CMPPlayerManager alloc] init];
@@ -174 +174 @@
                 {
                         //NSLog(@"Using Player");
-                        [player retain];
                         break;
                 }
@@ -206 +205 @@
         //XXX Prefs
         id <CMPPlayerController> controller = [[(Class)[goodControllers anyObject] alloc] initWithScene:scene player:player];
+        [goodControllers release];
         return [controller autorelease];
 }

trunk/CommonMediaPlayer/CommonMediaPlayer.xcodeproj/project.pbxproj

@@ -52 +52 @@
                 F50CCE911119DECA00213966 /* CMPDVDPlayerController.h in Headers */ = {isa = PBXBuildFile; fileRef = F50CCE8F1119DECA00213966 /* CMPDVDPlayerController.h */; settings = {ATTRIBUTES = (); }; };
                 F50CCE921119DECA00213966 /* CMPDVDPlayerController.m in Sources */ = {isa = PBXBuildFile; fileRef = F50CCE901119DECA00213966 /* CMPDVDPlayerController.m */; };
+                F512FF4811D170D40062B86E /* CMPOverlayAction.h in Headers */ = {isa = PBXBuildFile; fileRef = F512FF4611D170D40062B86E /* CMPOverlayAction.h */; };
+                F512FF4911D170D40062B86E /* CMPOverlayAction.m in Sources */ = {isa = PBXBuildFile; fileRef = F512FF4711D170D40062B86E /* CMPOverlayAction.m */; };
                 F531CAE3111E2EF9005DF910 /* CMPLeopardDVDPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = F531CAE1111E2EF9005DF910 /* CMPLeopardDVDPlayer.h */; };
                 F531CAE4111E2EF9005DF910 /* CMPLeopardDVDPlayer.m in Sources */ = {isa = PBXBuildFile; fileRef = F531CAE2111E2EF9005DF910 /* CMPLeopardDVDPlayer.m */; };
@@ -123 +125 @@
                 F50CCE8F1119DECA00213966 /* CMPDVDPlayerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CMPDVDPlayerController.h; sourceTree = "<group>"; };
                 F50CCE901119DECA00213966 /* CMPDVDPlayerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CMPDVDPlayerController.m; sourceTree = "<group>"; };
+                F512FF4611D170D40062B86E /* CMPOverlayAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CMPOverlayAction.h; sourceTree = "<group>"; };
+                F512FF4711D170D40062B86E /* CMPOverlayAction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CMPOverlayAction.m; sourceTree = "<group>"; };
                 F531CAE1111E2EF9005DF910 /* CMPLeopardDVDPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CMPLeopardDVDPlayer.h; sourceTree = "<group>"; };
                 F531CAE2111E2EF9005DF910 /* CMPLeopardDVDPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CMPLeopardDVDPlayer.m; sourceTree = "<group>"; };
@@ -325 +329 @@
                                 F5001CBD1120939D001B52FE /* CMPOverlayModeAction.h */,
                                 F5001CBE1120939D001B52FE /* CMPOverlayModeAction.m */,
+                                F512FF4611D170D40062B86E /* CMPOverlayAction.h */,
+                                F512FF4711D170D40062B86E /* CMPOverlayAction.m */,
                         );
                         path = "General Actions";
@@ -374 +380 @@
                                 87C75D8411BB51AE00D53B37 /* CMPMPPlayer.h in Headers */,
                                 87C75D8611BB51AE00D53B37 /* CMPMPPlayerController.h in Headers */,
+                                F512FF4811D170D40062B86E /* CMPOverlayAction.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -489 +496 @@
                                 87C75D8511BB51AE00D53B37 /* CMPMPPlayer.m in Sources */,
                                 87C75D8711BB51AE00D53B37 /* CMPMPPlayerController.m in Sources */,
+                                F512FF4911D170D40062B86E /* CMPOverlayAction.m in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/CommonMediaPlayer/General Actions/CMPOverlayAction.h

@@ -1 +1 @@
 /*
- * CMPDVDWindowCreationAction.h
+ * CMPOverlayAction.h
  * CommonMediaPlayer
  *
- * Created by Graham Booker on Feb. 2 2010
+ * Created by Graham Booker on Jun. 22 2010
  * Copyright 2010 Common Media Player
  * All rights reserved.
@@ -22 +22 @@
 #import "CMPActionController.h"
 
-@class CMPScreenReleaseAction, CMPDVDPlayer, CMPDVDPlayerPlayHeadView, CMPDVDSelectionView;
+@class CMPScreenReleaseAction, CMPPlayerPlayHeadView, CMPSelectionView;
 
 typedef enum {
-        CMPDVDOverlayUpperLeft,
-        CMPDVDOverlayUpperRight,
-        CMPDVDOverlayLowerLeft,
-        CMPDVDOverlayLowerRight,
-} CMPDVDOverlayPosition;
+        CMPOverlayUpperLeft,
+        CMPOverlayUpperRight,
+        CMPOverlayLowerLeft,
+        CMPOverlayLowerRight,
+} CMPOverlayPosition;
 
-@interface CMPDVDOverlayWindow : NSWindow
+@interface CMPOverlayWindow : NSWindow
 {
         NSRect                                  screenRect;
@@ -45 +45 @@
 @end
 
-@interface CMPDVDTextView : CMPDVDOverlayWindow
+@interface CMPTextView : CMPOverlayWindow
 {
-        CMPDVDOverlayPosition   position;
+        CMPOverlayPosition              position;
         NSTextField                             *textField;
 }
@@ -55 +55 @@
 @end
 
-@interface CMPDVDPlayerPlayHead : CMPDVDOverlayWindow {
+@interface CMPPlayerPlayHead : CMPOverlayWindow {
         NSTextField                                                     *elapsedField;
         NSTextField                                                     *durationField;
-        CMPDVDPlayer                                            *player;
-        CMPDVDPlayerPlayHeadView                        *playView;
-        NSTimer                                                         *updateTimer;
+        CMPPlayerPlayHeadView                           *playView;
 }
-- (void)setPlayer:(CMPDVDPlayer *)player;
+- (void)updateDisplayWithElapsed:(int)elapsedTime duration:(int)durationTime;
 
 @end
 
-@interface CMPDVDBlurredMenu : CMPDVDOverlayWindow
+@interface CMPBlurredMenu : CMPOverlayWindow
 {
         NSArray                                 *menuItems;
-        CMPDVDSelectionView             *selectionView;
+        CMPSelectionView                *selectionView;
         NSImageView                             *imageView;
         int                                             selectedItem;
@@ -79 +77 @@
 @end
 
+extern NSString *CMPOverlayActionWindowKey;
 
-@interface CMPDVDWindowCreationAction : NSObject <CMPActionController>{
-        CMPScreenReleaseAction  *screenRelease;
-        NSWindow                                *dvdWindow;
+@interface CMPOverlayAction : NSObject <CMPActionController>{
+        NSWindow                                *window;
         NSMutableArray                  *overlays;
 }
 
-- (void)setWindowAlpha:(float)alpha;
-- (CMPDVDOverlayWindow *)addBlackShieldWindow;
-- (CMPDVDTextView *)addTextOverlayInPosition:(CMPDVDOverlayPosition)position;
-- (CMPDVDPlayerPlayHead *)addPlayheadOverlay;
-- (CMPDVDBlurredMenu *)addBlurredMenuOverlayWithItems:(NSArray *)items;
-- (void)closeOverlay:(CMPDVDOverlayWindow *)overlay;
-- (void)closeOverlay:(CMPDVDOverlayWindow *)overlay withFade:(NSNumber *)fadeTimeNumber;
+- (CMPOverlayWindow *)addBlackShieldWindow;
+- (CMPTextView *)addTextOverlayInPosition:(CMPOverlayPosition)position;
+- (CMPPlayerPlayHead *)addPlayheadOverlay;
+- (CMPBlurredMenu *)addBlurredMenuOverlayWithItems:(NSArray *)items;
+- (void)closeOverlay:(CMPOverlayWindow *)overlay;
+- (void)closeOverlay:(CMPOverlayWindow *)overlay withFade:(NSNumber *)fadeTimeNumber;
 - (void)closeAllOverlays;
 - (void)closeAllOverlaysWithFadeTime:(float)fadeTime;

trunk/CommonMediaPlayer/General Actions/CMPOverlayAction.m

@@ -1 +1 @@
 /*
- * CMPDVDWindowCreationAction.m
+ * CMPOverlayAction.m
  * CommonMediaPlayer
  *
- * Created by Graham Booker on Feb. 2 2010
+ * Created by Graham Booker on Jun. 22 2010
  * Copyright 2010 Common Media Player
  * All rights reserved.
@@ -20 +20 @@
  */
 
-#import <DVDPlayback/DVDPlayback.h>
-
-#import "CMPDVDWindowCreationAction.h"
-#import "CMPScreenReleaseAction.h"
+#import "CMPOverlayAction.h"
 #import "CoreGraphicsServices.h"
 #import "CMPOverlayModeAction.h"
 #import "CMPATVVersion.h"
-#import "CMPDVDPlayer.h"
 
 #define ANIMATE_TIME_INTERVAL 0.02
 
-@implementation CMPDVDOverlayWindow
+@implementation CMPOverlayWindow
 
 - (id)initWithContentRect:(NSRect)contentRect overWindow:(int)windowID
@@ -127 +123 @@
 @end
 
-@implementation CMPDVDTextView
-
-- (id)initWithContentRect:(NSRect)contentRect position:(CMPDVDOverlayPosition)aPosition overWindow:(int)windowID
+@implementation CMPTextView
+
+- (id)initWithContentRect:(NSRect)contentRect position:(CMPOverlayPosition)aPosition overWindow:(int)windowID
 {
         self = [super initWithContentRect:contentRect overWindow:windowID];
@@ -164 +160 @@
         //NSLog(@"Size is %fx%f", frameRect.size.width, frameRect.size.height);
         float distanceFromEdge = screenRect.size.height / 15;
-        if(position == CMPDVDOverlayUpperLeft || position == CMPDVDOverlayUpperRight)
+        if(position == CMPOverlayUpperLeft || position == CMPOverlayUpperRight)
                 frameRect.origin.y = screenRect.size.height - frameRect.size.height - distanceFromEdge;
         else
                 frameRect.origin.y = distanceFromEdge;
-        if(position == CMPDVDOverlayUpperRight || position == CMPDVDOverlayLowerRight)
+        if(position == CMPOverlayUpperRight || position == CMPOverlayLowerRight)
                 frameRect.origin.x = screenRect.size.width - frameRect.size.width - distanceFromEdge;
         else
@@ -178 +174 @@
 
 
-@interface CMPDVDPlayerPlayHeadView : NSView
+@interface CMPPlayerPlayHeadView : NSView
 {
         float                   playHeadLocation;
@@ -186 +182 @@
 @end
 
-@implementation CMPDVDPlayerPlayHeadView
+@implementation CMPPlayerPlayHeadView
 
 - (void)drawRect:(NSRect)rect
@@ -225 +221 @@
 
 
-@implementation CMPDVDPlayerPlayHead
+@implementation CMPPlayerPlayHead
 
 - (id)initWithContentRect:(NSRect)contentRect overWindow:(int)windowID
@@ -261 +257 @@
         [durationField setSelectable:NO];
         
-        playView = [[CMPDVDPlayerPlayHeadView alloc] initWithFrame:NSMakeRect(textWidth + textBuffer, textHeight / 5, myWidth-textWidth*2-textBuffer*2, textHeight * 3 /5)];
+        playView = [[CMPPlayerPlayHeadView alloc] initWithFrame:NSMakeRect(textWidth + textBuffer, textHeight / 5, myWidth-textWidth*2-textBuffer*2, textHeight * 3 /5)];
         [[self contentView] addSubview:playView];
         [self setFrame:NSMakeRect(contentRect.size.width * 5 / 64, textHeight*2, myWidth, textHeight) display:NO];
@@ -271 +267 @@
 {
         [durationField release];
-        [player release];
         [playView release];
-        [updateTimer invalidate];
         [super dealloc];
 }
 
-NSString *timeStringForTime(int time)
+static NSString *timeStringForTime(int time)
 {
         int seconds = time % 60;
@@ -291 +285 @@
 }
 
-- (void)close
-{
-        [updateTimer invalidate];
-        updateTimer = nil;
-        [super close];
-}
-
-- (void)updateDisplay
-{
-        int elapsedTime = [player titleElapsedTime];
-        int durationTime = [player titleDurationTime];
-        
+- (void)updateDisplayWithElapsed:(int)elapsedTime duration:(int)durationTime
+{
         [elapsedField setStringValue:timeStringForTime(elapsedTime)];
         [durationField setStringValue:timeStringForTime(durationTime)];
@@ -308 +292 @@
 }
 
-- (void)setPlayer:(CMPDVDPlayer *)aPlayer
-{
-        [player release];
-        player = [aPlayer retain];
-        
-        [self updateDisplay];
-        
-        [updateTimer invalidate];
-        updateTimer = [NSTimer scheduledTimerWithTimeInterval:1 target:self selector:@selector(updateDisplay) userInfo:nil repeats:YES];
-}
-
-@end
-
-@interface CMPDVDSelectionView : NSView
+@end
+
+@interface CMPSelectionView : NSView
 {
         NSTimer                 *moveTimer;
@@ -329 +302 @@
 @end
 
-@implementation CMPDVDSelectionView
-
-#define CMPDVDSelectionViewMoveTime 0.2
+@implementation CMPSelectionView
+
+#define CMPSelectionViewMoveTime 0.2
 
 - (id)initWithFrame:(NSRect)frame
@@ -351 +324 @@
 }
 
-void Interpolate (void* info, float const* inData, float* outData)
+static void Interpolate (void* info, float const* inData, float* outData)
 {
         float value = sin(M_PI_2 * inData[0])/2;
@@ -412 +385 @@
         double interval = -[startTime timeIntervalSinceNow];
         float currentY;
-        if(interval > CMPDVDSelectionViewMoveTime)
+        if(interval > CMPSelectionViewMoveTime)
         {
                 currentY = finalY;
@@ -419 +392 @@
         }
         else
-                currentY = initialY + (finalY - initialY) * interval / CMPDVDSelectionViewMoveTime;
+                currentY = initialY + (finalY - initialY) * interval / CMPSelectionViewMoveTime;
         NSRect frame = [self frame];
         NSRect newFrame = frame;
@@ -442 +415 @@
 
 
-@implementation CMPDVDBlurredMenu
+@implementation CMPBlurredMenu
 
 - (id)initWithItems:(NSArray*)anItems contentRect:(NSRect)contentRect overWindow:(int)windowID
@@ -463 +436 @@
         float inset = contentRect.size.height * 5 / 144;
         float borderSize = contentRect.size.height / 72;
-        selectionView = [[CMPDVDSelectionView alloc] initWithFrame:NSMakeRect(left, bottom + itemHeight * (itemCount-1) - borderSize, itemWidth, itemHeight+borderSize*2)];
+        selectionView = [[CMPSelectionView alloc] initWithFrame:NSMakeRect(left, bottom + itemHeight * (itemCount-1) - borderSize, itemWidth, itemHeight+borderSize*2)];
         [[self contentView] addSubview:selectionView];
         
@@ -595 +568 @@
 @end
 
-
+NSString *CMPOverlayActionWindowKey = @"window";
 
 @interface BRDisplayManager (compat)
@@ -601 +574 @@
 @end
 
-@implementation CMPDVDWindowCreationAction
+@implementation CMPOverlayAction
 
 - (id)initWithController:(id <CMPPlayerController>)controller andSettings:(NSDictionary *)settings
 {
+        NSWindow *win = [settings objectForKey:CMPOverlayActionWindowKey];
+        if(win == nil)
+                return [self autorelease];
+        
         self = [super init];
         if(!self)
                 return self;
         
-//      screenRelease = [[CMPOverlayModeAction alloc] initWithController:controller andSettings:settings];
-        screenRelease = [[CMPScreenReleaseAction alloc] initWithController:controller andSettings:settings];
+        window = [win retain];
         overlays = [[NSMutableArray alloc] init];
         
@@ -618 +594 @@
 - (void) dealloc
 {
-        [screenRelease release];
-        [dvdWindow release];
+        [window release];
         [overlays release];
         [super dealloc];
 }
 
-static int CreateEmptyWindow(CGRect myFrame)
-{
-        //NSLog(@"createEmptyWindow");
-    CGSRegion frameRgn;
-    CGSRegion emptyRgn;
-    int window;
-    char something[100];
-        
-        
-    CGSNewRegionWithRect(&myFrame, &frameRgn);
-    CGSNewEmptyRegion(&emptyRgn);
-        
-    int conn = CGSMainConnectionID();
-        
-        //NSLog(@"connection id: %i", conn);
-        
-    CGSNewWindowWithOpaqueShape(conn, 2, 0, 0, frameRgn, emptyRgn, 0, &something,
-                                                                32, &window);
-        
-    
-        CGSSetWindowOpacity(conn, window, 1);
-        
-        
-    CGSReleaseRegion(emptyRgn);
-    CGSReleaseRegion(frameRgn);
-        
-    return window;
-}
-
 - (BOOL)openWithError:(NSError **)error
 {
-        BOOL success = [screenRelease openWithError:error];
-        
-        if(!success)
-        {       
-                NSLog(@"Release failed");
-                return NO;
-        }
-        
-        //NSLog(@"createDvdWindow");
-    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);
-        
-        NSRect frameRect = NSMakeRect(frame.origin.x, frame.origin.y, frame.size.width, frame.size.height);
-        NSApplicationLoad();
-        dvdWindow = [[NSWindow alloc] initWithContentRect:frameRect styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO];
-        [dvdWindow setReleasedWhenClosed:NO];
-        [dvdWindow setBackgroundColor:[NSColor blackColor]];
-        int dvdWindowID = [dvdWindow windowNumber];
-        //dvdWindowID = CreateEmptyWindow(frame);
-        CGSSetWindowLevel(_CGSDefaultConnection(), dvdWindowID, CGShieldingWindowLevel()+1);
-                
-        CGSOrderWindow(_CGSDefaultConnection(), dvdWindowID, kCGSOrderAbove, 0);
-        
-    CGContextRef ctx = (CGContextRef)CGWindowContextCreate(_CGSDefaultConnection(), dvdWindowID, NULL);
-        
-    CGContextClear(ctx);
-    CGContextFlush(ctx);
-    CGContextRelease(ctx);
-                
-        OSStatus setWindowErr = DVDSetVideoWindowID(dvdWindowID);
-        if(setWindowErr != noErr)
-                NSLog(@"Set DVD Window error is %d", setWindowErr);
-        OSStatus displayErr = DVDSetVideoDisplay([[BRDisplayManager sharedInstance] display]);
-        if(displayErr != noErr)
-                NSLog(@"Set DVD Video error is %d", displayErr);
-        
-        return setWindowErr == noErr && displayErr == noErr;
-}
-
-- (void)setWindowAlpha:(float)alpha
-{
-        [dvdWindow setAlphaValue:alpha];
-}
-
-- (CMPDVDOverlayWindow *)addBlackShieldWindow
-{
-        CMPDVDOverlayWindow *ret = [[CMPDVDOverlayWindow alloc] initWithContentRect:[dvdWindow frame] overWindow:[dvdWindow windowNumber]];
+        return YES;
+}
+
+- (CMPOverlayWindow *)addBlackShieldWindow
+{
+        CMPOverlayWindow *ret = [[CMPOverlayWindow alloc] initWithContentRect:[window frame] overWindow:[window windowNumber]];
         
         [overlays addObject:ret];
@@ -716 +614 @@
 }
 
-- (CMPDVDTextView *)addTextOverlayInPosition:(CMPDVDOverlayPosition)position
-{
-        CMPDVDTextView *ret = [[CMPDVDTextView alloc] initWithContentRect:[dvdWindow frame] position:position overWindow:[dvdWindow windowNumber]];
+- (CMPTextView *)addTextOverlayInPosition:(CMPOverlayPosition)position
+{
+        CMPTextView *ret = [[CMPTextView alloc] initWithContentRect:[window frame] position:position overWindow:[window windowNumber]];
         
         [overlays addObject:ret];
@@ -726 +624 @@
 }
 
-- (CMPDVDPlayerPlayHead *)addPlayheadOverlay
-{
-        CMPDVDPlayerPlayHead *ret = [[CMPDVDPlayerPlayHead alloc] initWithContentRect:[dvdWindow frame] overWindow:[dvdWindow windowNumber]];
+- (CMPPlayerPlayHead *)addPlayheadOverlay
+{
+        CMPPlayerPlayHead *ret = [[CMPPlayerPlayHead alloc] initWithContentRect:[window frame] overWindow:[window windowNumber]];
         
         [overlays addObject:ret];
@@ -736 +634 @@
 }
 
-- (CMPDVDBlurredMenu *)addBlurredMenuOverlayWithItems:(NSArray *)items
-{
-        CMPDVDBlurredMenu *ret = [[CMPDVDBlurredMenu alloc] initWithItems:items contentRect:[dvdWindow frame] overWindow:[dvdWindow windowNumber]];
+- (CMPBlurredMenu *)addBlurredMenuOverlayWithItems:(NSArray *)items
+{
+        CMPBlurredMenu *ret = [[CMPBlurredMenu alloc] initWithItems:items contentRect:[window frame] overWindow:[window windowNumber]];
         
         [overlays addObject:ret];
@@ -746 +644 @@
 }
 
-- (void)closeOverlay:(CMPDVDOverlayWindow *)overlay
+- (void)closeOverlay:(CMPOverlayWindow *)overlay
 {
         [self closeOverlay:overlay withFade:[NSNumber numberWithFloat:0]];
 }
 
-- (void)closeOverlay:(CMPDVDOverlayWindow *)overlay withFade:(NSNumber *)fadeTimeNumber
+- (void)closeOverlay:(CMPOverlayWindow *)overlay withFade:(NSNumber *)fadeTimeNumber
 {
         [overlay closeWithFadeTime:fadeTimeNumber];
@@ -774 +672 @@
 - (BOOL)closeWithError:(NSError **)error
 {
-//      int conn = _CGSDefaultConnection();
-//      NSLog(@"conn: %i dvdWindow: %i", conn, dvdWindowID);
-//      OSStatus theErr = CGSReleaseWindow(conn, dvdWindowID);
-//      NSLog(@"CGSReleaseWindow: %d", theErr);
         [self closeAllOverlays];
-        [dvdWindow close];
-        
-        return [screenRelease closeWithError:error];
-}
-@end
+        [window close];
+        return YES;
+}
+@end

trunk/CommonMediaPlayer/Media Players/DVD Framework/CMPDVDPlayer.h

@@ -51 +51 @@
 } CMPDVDZoomLevel;
 
-@class CMPDVDPlayerController, CMPDVDFrameworkLoadAction;
+@class CMPDVDPlayerController, CMPDVDFrameworkLoadAction, CMPPlayerPlayHead;
 
 @interface CMPDVDPlayer : NSObject <CMPPlayer>{
@@ -65 +65 @@
         CMPDVDZoomLevel                         zoomLevel;
         BOOL                                            useStopTimer;
+        CMPPlayerPlayHead                       *playhead;
 }
 
@@ -104 +105 @@
 - (void)setZoomLevel:(CMPDVDZoomLevel)level;
 - (CMPDVDZoomLevel)zoomLevel;
+- (void)setPlayhead:(CMPPlayerPlayHead *)playhead;
 + (BOOL)isVolume:(NSString *)theVolume;
 + (BOOL)isImage:(NSString *)theVolume;

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

@@ -24 +24 @@
 #import "CMPDVDFrameworkLoadAction.h"
 #import "CMPDVDPlayerController.h"
+#import "CMPOverlayAction.h"
 #import <AudioUnit/AudioUnit.h>
 
@@ -77 +78 @@
         [frameworkLoad release];
         [stopTimer invalidate];
+        [playhead release];
         [super dealloc];
 }
@@ -707 +709 @@
 }
 
+- (void)setPlayhead:(CMPPlayerPlayHead *)aPlayhead
+{
+        [playhead release];
+        playhead = [aPlayhead retain];
+        [playhead updateDisplayWithElapsed:currentElapsedTime duration:titleDuration];
+}
+
 static BOOL pauseOnPlay = NO;
 - (void)initiatePlaybackWithResume:(BOOL *)resume;
@@ -759 +768 @@
         DVDCloseMediaFile();
         DVDCloseMediaVolume();
-        DVDSetVideoDisplay(kCGNullDirectDisplay);
+        //Seems to crash SL
+        //DVDSetVideoDisplay(kCGNullDirectDisplay);
         DVDDispose();
 }
@@ -910 +920 @@
 }
 
+- (void)updatePlayhead
+{
+        [playhead updateDisplayWithElapsed:currentElapsedTime duration:titleDuration];
+}
+
 - (void)titleTimeChanged
 {
@@ -922 +937 @@
         if(time != 0)
                 currentElapsedTime = time;
+        if(playhead != nil)
+                [self performSelectorOnMainThread:@selector(updatePlayhead) withObject:nil waitUntilDone:NO];
 }
 
@@ -1094 +1111 @@
                         return NO;
         }
+        DVDSetTimeEventRate(100);
         return result == noErr;
 }

trunk/CommonMediaPlayer/Media Players/DVD Framework/CMPDVDPlayerController.h

@@ -22 +22 @@
 #import "CMPPlayerController.h"
 
-@class CMPDVDPlayer, CMPDVDWindowCreationAction, CMPDVDTextView, CMPDVDPlayerPlayHead, CMPDVDBlurredMenu;
+@class CMPDVDPlayer, CMPDVDWindowCreationAction, CMPTextView, CMPPlayerPlayHead, CMPBlurredMenu, CMPOverlayAction;
 
 typedef enum {
@@ -37 +37 @@
         id <CMPPlayerControllerDelegate>        delegate;
         CMPDVDWindowCreationAction                      *windowCreation;
+        CMPOverlayAction                                        *overlay;
 #ifdef PLAY_WITH_OVERLAY
         BOOL                                                            blacked;
@@ -42 +43 @@
         CMPDVDPlayerControllerOverlayMode       overlayMode;
         NSTimer                                                         *overlayDismiss;
-        CMPDVDTextView                                          *statusOverlay;
-        CMPDVDTextView                                          *subtitlesOverlay;
-        CMPDVDTextView                                          *audioOverlay;
-        CMPDVDTextView                                          *chapterOverlay;
-        CMPDVDTextView                                          *zoomOverlay;
-        CMPDVDPlayerPlayHead                            *playheadOverlay;
-        CMPDVDBlurredMenu                                       *blurredMenu;
+        CMPTextView                                                     *statusOverlay;
+        CMPTextView                                                     *subtitlesOverlay;
+        CMPTextView                                                     *audioOverlay;
+        CMPTextView                                                     *chapterOverlay;
+        CMPTextView                                                     *zoomOverlay;
+        CMPPlayerPlayHead                                       *playheadOverlay;
+        CMPBlurredMenu                                          *blurredMenu;
 }
 

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

@@ -23 +23 @@
 #import "CMPDVDPlayer.h"
 #import "CMPDVDWindowCreationAction.h"
+#import "CMPOverlayAction.h"
 #import "CMPATVVersion.h"
 #import "CoreGraphicsServices.h"
@@ -140 +141 @@
         [delegate release];
         [windowCreation release];
+        [overlay release];
         [overlayDismiss invalidate];
         [statusOverlay release];
@@ -195 +197 @@
 //      [self setOpacity:0.0f];
         [windowCreation openWithError:nil];
+        overlay = [[windowCreation overlayAction] retain];
         BOOL resume = NO;
-        CMPDVDOverlayWindow *shield = [windowCreation addBlackShieldWindow];
+        CMPOverlayWindow *shield = [overlay addBlackShieldWindow];
         [shield display];
         [player initiatePlaybackWithResume:&resume];
@@ -202 +205 @@
         {
                 [self showResumeOverlayWithDismiss:NO];
-                [windowCreation performSelector:@selector(closeOverlay:) withObject:shield afterDelay:0.5];
+                [overlay performSelector:@selector(closeOverlay:) withObject:shield afterDelay:0.5];
         }
         else
-                [windowCreation closeOverlay:shield withFade:[NSNumber numberWithFloat:0]];
+                [overlay closeOverlay:shield withFade:[NSNumber numberWithFloat:0]];
 }
 
@@ -343 +346 @@
 }
 
-static void closeAndNilOverlay(CMPDVDWindowCreationAction *windowCreation, CMPDVDOverlayWindow * *overlay, NSNumber *fadeTime)
-{
-        CMPDVDOverlayWindow *actualOverlay = *overlay;
-        [windowCreation closeOverlay:actualOverlay withFade:fadeTime];
+static void closeAndNilOverlay(CMPOverlayAction *overlayAction, CMPOverlayWindow * *overlay, NSNumber *fadeTime)
+{
+        CMPOverlayWindow *actualOverlay = *overlay;
+        [overlayAction closeOverlay:actualOverlay withFade:fadeTime];
         [actualOverlay release];
         *overlay = nil;
@@ -382 +385 @@
         
         if(closeStatus)
-                closeAndNilOverlay(windowCreation, &statusOverlay, fadeTime);
+                closeAndNilOverlay(overlay, &statusOverlay, fadeTime);
         if(closeSubtitles)
-                closeAndNilOverlay(windowCreation, &subtitlesOverlay, fadeTime);
+                closeAndNilOverlay(overlay, &subtitlesOverlay, fadeTime);
         if(closeAudio)
-                closeAndNilOverlay(windowCreation, &audioOverlay, fadeTime);
+                closeAndNilOverlay(overlay, &audioOverlay, fadeTime);
         if(closeChapter)
-                closeAndNilOverlay(windowCreation, &chapterOverlay, fadeTime);
+                closeAndNilOverlay(overlay, &chapterOverlay, fadeTime);
         if(closeZoom)
-                closeAndNilOverlay(windowCreation, &zoomOverlay, fadeTime);
-        if(closePlayhead)
-                closeAndNilOverlay(windowCreation, &playheadOverlay, fadeTime);
+                closeAndNilOverlay(overlay, &zoomOverlay, fadeTime);
+        if(closePlayhead) {
+                [player setPlayhead:nil];
+                closeAndNilOverlay(overlay, &playheadOverlay, fadeTime);                
+        }
 }
 
@@ -412 +417 @@
         if(playheadOverlay)
                 return;
-        playheadOverlay = [[windowCreation addPlayheadOverlay] retain];
-        [playheadOverlay setPlayer:player];
+        playheadOverlay = [[overlay addPlayheadOverlay] retain];
         [playheadOverlay displayWithFadeTime:0.1];
+        [player setPlayhead:playheadOverlay];
 }
 
@@ -423 +428 @@
         
         if(!subtitlesOverlay)
-                subtitlesOverlay = [[windowCreation addTextOverlayInPosition:CMPDVDOverlayUpperLeft] retain];
+                subtitlesOverlay = [[overlay addTextOverlayInPosition:CMPOverlayUpperLeft] retain];
         [subtitlesOverlay setText:[player currentSubFormat]];
         [subtitlesOverlay displayWithFadeTime:0.25];
         if(!audioOverlay)
-                audioOverlay = [[windowCreation addTextOverlayInPosition:CMPDVDOverlayUpperRight] retain];
+                audioOverlay = [[overlay addTextOverlayInPosition:CMPOverlayUpperRight] retain];
         [audioOverlay setText:[player currentAudioFormat]];
         [audioOverlay displayWithFadeTime:0.25];
@@ -445 +450 @@
         
         if(!chapterOverlay)
-                chapterOverlay = [[windowCreation addTextOverlayInPosition:CMPDVDOverlayUpperLeft] retain];
+                chapterOverlay = [[overlay addTextOverlayInPosition:CMPOverlayUpperLeft] retain];
         [chapterOverlay setText:[self chapterString]];
         [chapterOverlay displayWithFadeTime:0.25];
@@ -470 +475 @@
         
         if(!zoomOverlay)
-                zoomOverlay = [[windowCreation addTextOverlayInPosition:CMPDVDOverlayUpperRight] retain];
+                zoomOverlay = [[overlay addTextOverlayInPosition:CMPOverlayUpperRight] retain];
         [zoomOverlay setText:[self zoomModeString]];
         [zoomOverlay displayWithFadeTime:0.25];
@@ -504 +509 @@
         
         if(!statusOverlay)
-                statusOverlay = [[windowCreation addTextOverlayInPosition:CMPDVDOverlayUpperLeft] retain];
+                statusOverlay = [[overlay addTextOverlayInPosition:CMPOverlayUpperLeft] retain];
         [statusOverlay setText:[self stringForPlayerState]];
         [statusOverlay displayWithFadeTime:0.25];
@@ -518 +523 @@
         
         //Catch any others
-        [windowCreation closeAllOverlaysWithFadeTime:fadeTime];
+        [overlay closeAllOverlaysWithFadeTime:fadeTime];
         
         [overlayDismiss invalidate];
@@ -528 +533 @@
         if(dismiss)
                 [self dismissOverlaysWithFadeTime:0];
-        blurredMenu = [[windowCreation addBlurredMenuOverlayWithItems:[NSArray arrayWithObjects:@"Resume Playback", @"Start From Beginning", @"Main Menu", nil]] retain];
+        blurredMenu = [[overlay addBlurredMenuOverlayWithItems:[NSArray arrayWithObjects:@"Resume Playback", @"Start From Beginning", @"Main Menu", nil]] retain];
         [blurredMenu displayWithFadeTime:0.5];
 }

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

@@ -22 +22 @@
 #import "CMPActionController.h"
 
-@class CMPScreenReleaseAction, CMPDVDPlayer, CMPDVDPlayerPlayHeadView, CMPDVDSelectionView;
-
-typedef enum {
-        CMPDVDOverlayUpperLeft,
-        CMPDVDOverlayUpperRight,
-        CMPDVDOverlayLowerLeft,
-        CMPDVDOverlayLowerRight,
-} CMPDVDOverlayPosition;
-
-@interface CMPDVDOverlayWindow : NSWindow
-{
-        NSRect                                  screenRect;
-        int                                             overWindowID;
-        float                                   initialOpacity, finalOpacity, fadeTime;
-        NSTimer                                 *opacityChangeTimer;
-        NSDate                                  *opacityChangeStartTime;
-}
-
-- (void)display;
-- (void)displayWithFadeTime:(float)fadeTime;
-
-@end
-
-@interface CMPDVDTextView : CMPDVDOverlayWindow
-{
-        CMPDVDOverlayPosition   position;
-        NSTextField                             *textField;
-}
-
-- (void)setText:(NSString *)text;
-
-@end
-
-@interface CMPDVDPlayerPlayHead : CMPDVDOverlayWindow {
-        NSTextField                                                     *elapsedField;
-        NSTextField                                                     *durationField;
-        CMPDVDPlayer                                            *player;
-        CMPDVDPlayerPlayHeadView                        *playView;
-        NSTimer                                                         *updateTimer;
-}
-- (void)setPlayer:(CMPDVDPlayer *)player;
-
-@end
-
-@interface CMPDVDBlurredMenu : CMPDVDOverlayWindow
-{
-        NSArray                                 *menuItems;
-        CMPDVDSelectionView             *selectionView;
-        NSImageView                             *imageView;
-        int                                             selectedItem;
-        int                                             itemHeight;
-}
-- (BOOL)previousItem;
-- (BOOL)nextItem;
-- (int)selectedItem;
-@end
-
+@class CMPScreenReleaseAction, CMPDVDPlayer, CMPOverlayAction;
 
 @interface CMPDVDWindowCreationAction : NSObject <CMPActionController>{
         CMPScreenReleaseAction  *screenRelease;
+        CMPOverlayAction                *overlayAction;
         NSWindow                                *dvdWindow;
-        NSMutableArray                  *overlays;
 }
 
 - (void)setWindowAlpha:(float)alpha;
-- (CMPDVDOverlayWindow *)addBlackShieldWindow;
-- (CMPDVDTextView *)addTextOverlayInPosition:(CMPDVDOverlayPosition)position;
-- (CMPDVDPlayerPlayHead *)addPlayheadOverlay;
-- (CMPDVDBlurredMenu *)addBlurredMenuOverlayWithItems:(NSArray *)items;
-- (void)closeOverlay:(CMPDVDOverlayWindow *)overlay;
-- (void)closeOverlay:(CMPDVDOverlayWindow *)overlay withFade:(NSNumber *)fadeTimeNumber;
-- (void)closeAllOverlays;
-- (void)closeAllOverlaysWithFadeTime:(float)fadeTime;
-
+- (CMPOverlayAction *)overlayAction;
 @end

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

@@ -28 +28 @@
 #import "CMPATVVersion.h"
 #import "CMPDVDPlayer.h"
-
-#define ANIMATE_TIME_INTERVAL 0.02
-
-@implementation CMPDVDOverlayWindow
-
-- (id)initWithContentRect:(NSRect)contentRect overWindow:(int)windowID
-{
-        self = [super initWithContentRect:contentRect styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO];
-        if(!self)
-                return self;
-        
-        screenRect = contentRect;
-        overWindowID = windowID;
-        [self setReleasedWhenClosed:NO];
-        
-        [self setBackgroundColor:[NSColor blackColor]];
-        [[self contentView] setNeedsDisplay:YES];
-        
-        return self;
-}
-
-- (void) dealloc
-{
-        [opacityChangeTimer invalidate];
-        [opacityChangeStartTime release];
-        [super dealloc];
-}
-
-- (void)display
-{
-        CGSSetWindowLevel(_CGSDefaultConnection(), [self windowNumber], CGShieldingWindowLevel()+1);
-        CGSOrderWindow(_CGSDefaultConnection(), [self windowNumber], kCGSOrderAbove, overWindowID);
-        [super display];
-}
-
-- (void)closeWithFadeTime:(NSNumber *)aFadeTimeNumber
-{
-        float aFadeTime = [aFadeTimeNumber floatValue];
-        //Alpha is horrible on the ATV since it displays grey, but this one step fade forces everything to draw in the background before it is displayed.
-        if(![CMPATVVersion usingLeopard])
-                aFadeTime = ANIMATE_TIME_INTERVAL / 2;
-        if(aFadeTime == 0)
-        {
-                [self close];
-                return;
-        }
-        initialOpacity = [self alphaValue];
-        finalOpacity = 0;
-        fadeTime = aFadeTime;
-        [opacityChangeStartTime release];
-        opacityChangeStartTime = [[NSDate date] retain];
-        [opacityChangeTimer invalidate];
-        opacityChangeTimer = [NSTimer scheduledTimerWithTimeInterval:ANIMATE_TIME_INTERVAL target:self selector:@selector(opacityTimerFire) userInfo:nil repeats:YES];
-}
-
-- (void)displayWithFadeTime:(float)aFadeTime
-{
-        if(finalOpacity == 1)
-                //Already displayed
-                return;
-        //Same as above
-        if(![CMPATVVersion usingLeopard])
-                aFadeTime = ANIMATE_TIME_INTERVAL / 2;
-        if(aFadeTime)
-                [self setAlphaValue:0];
-        [self display];
-        if(aFadeTime)
-        {
-                initialOpacity = 0;
-                finalOpacity = 1;
-                fadeTime = aFadeTime;
-                opacityChangeStartTime = [[NSDate date] retain];
-                opacityChangeTimer = [NSTimer scheduledTimerWithTimeInterval:ANIMATE_TIME_INTERVAL target:self selector:@selector(opacityTimerFire) userInfo:nil repeats:YES];          
-        }
-}
-
-- (void)opacityTimerFire
-{
-        double interval = -[opacityChangeStartTime timeIntervalSinceNow];
-        float currentOpacity;
-        if(interval > fadeTime)
-        {
-                [[self retain] autorelease];    //Prevent us from being released with the invalidate
-                currentOpacity = finalOpacity;
-                [opacityChangeTimer invalidate];
-                opacityChangeTimer = nil;
-                if(finalOpacity == 0)
-                {
-                        [self close];
-                        return;
-                }
-        }
-        else
-                currentOpacity = initialOpacity + (finalOpacity - initialOpacity) * interval / fadeTime;
-        [self setAlphaValue:currentOpacity];
-}
-
-@end
-
-@implementation CMPDVDTextView
-
-- (id)initWithContentRect:(NSRect)contentRect position:(CMPDVDOverlayPosition)aPosition overWindow:(int)windowID
-{
-        self = [super initWithContentRect:contentRect overWindow:windowID];
-        if(!self)
-                return nil;
-        
-        position = aPosition;
-        textField = [[NSTextField alloc] initWithFrame:NSMakeRect(0, 0, 300, 300)];
-        [[self contentView] addSubview:textField];
-        [textField setStringValue:@""];
-        [textField setTextColor:[NSColor colorWithDeviceHue:227.0f/360.0f saturation:.60f brightness:1 alpha:1]];
-        [textField setBackgroundColor:[NSColor blackColor]];
-        NSFont *font = [textField font];
-        NSFont *newFont = [NSFont fontWithName:[font fontName] size:contentRect.size.height / 15];
-        [textField setFont:newFont];
-        [textField setBezeled:NO];
-        [textField setBordered:NO];
-        
-        return self;
-}
-
-- (void)dealloc
-{
-        [textField release];
-        [super dealloc];
-}
-
-- (void)setText:(NSString *)text
-{
-        [textField setStringValue:text];
-        [textField sizeToFit];
-        NSRect frameRect;
-        frameRect.size = [textField frame].size;
-        //NSLog(@"Size is %fx%f", frameRect.size.width, frameRect.size.height);
-        float distanceFromEdge = screenRect.size.height / 15;
-        if(position == CMPDVDOverlayUpperLeft || position == CMPDVDOverlayUpperRight)
-                frameRect.origin.y = screenRect.size.height - frameRect.size.height - distanceFromEdge;
-        else
-                frameRect.origin.y = distanceFromEdge;
-        if(position == CMPDVDOverlayUpperRight || position == CMPDVDOverlayLowerRight)
-                frameRect.origin.x = screenRect.size.width - frameRect.size.width - distanceFromEdge;
-        else
-                frameRect.origin.x = distanceFromEdge;
-        [self setFrame:frameRect display:YES];  
-}
-
-@end
-
-
-@interface CMPDVDPlayerPlayHeadView : NSView
-{
-        float                   playHeadLocation;
-}
-- (void)setPlayHeadLocation:(float)playHeadLocation;
-
-@end
-
-@implementation CMPDVDPlayerPlayHeadView
-
-- (void)drawRect:(NSRect)rect
-{
-        NSRect myFrame = [self frame];
-        float height = myFrame.size.height;
-        float width = myFrame.size.width;
-        [[NSColor blackColor] set];
-        NSRectFill(rect);
-        NSBezierPath *path = [NSBezierPath bezierPath];
-        [path moveToPoint:NSMakePoint(height/2, height)];
-        [path appendBezierPathWithArcWithCenter:NSMakePoint(height/2, height/2) radius:height/2 startAngle:90 endAngle:270];
-        [path lineToPoint:NSMakePoint(width-height/2, 0)];
-        [path appendBezierPathWithArcWithCenter:NSMakePoint(width-height/2, height/2) radius:height/2 startAngle:270 endAngle:90];
-        [path closePath];
-        [[NSColor colorWithDeviceHue:227.0f/360.0f saturation:.60f brightness:1 alpha:1] set];
-        [path fill];
-        
-        path = [NSBezierPath bezierPath];
-        float position = playHeadLocation * (width - height) + height/2;
-        float border = height / 20;
-        [path moveToPoint:NSMakePoint(position, border)];
-        [path lineToPoint:NSMakePoint(position-height/2+border, height/2)];
-        [path lineToPoint:NSMakePoint(position, height-border)];
-        [path lineToPoint:NSMakePoint(position+height/2-border, height/2)];
-        [path closePath];
-        [[NSColor blackColor] set];
-        [path fill];
-}
-
-- (void)setPlayHeadLocation:(float)aPlayHeadLocation
-{
-        playHeadLocation = aPlayHeadLocation;
-        [self setNeedsDisplay:YES];
-}
-
-@end
-
-
-@implementation CMPDVDPlayerPlayHead
-
-- (id)initWithContentRect:(NSRect)contentRect overWindow:(int)windowID
-{
-        self = [super initWithContentRect:contentRect overWindow:windowID];
-        if(!self)
-                return self;
-        
-        float myWidth = contentRect.size.width * 27 / 32;
-        float textHeight = contentRect.size.height * 3 / 72;
-        float textWidth = textHeight * 3;
-        float textBuffer = textHeight / 2;
-        float textSize = contentRect.size.height / 33;
-        elapsedField = [[NSTextField alloc] initWithFrame:NSMakeRect(0, (textSize-textHeight)/7, textWidth, textHeight)];
-        [[self contentView] addSubview:elapsedField];
-        [elapsedField setStringValue:@""];
-        [elapsedField setTextColor:[NSColor whiteColor]];
-        [elapsedField setBackgroundColor:[NSColor blackColor]];
-        NSFont *font = [elapsedField font];
-        NSFont *newFont = [NSFont fontWithName:[font fontName] size:textSize];
-        [elapsedField setFont:newFont];
-        [elapsedField setBezeled:NO];
-        [elapsedField setBordered:NO];
-        [elapsedField setSelectable:NO];
-        [elapsedField setAlignment:NSRightTextAlignment];
-        
-        durationField = [[NSTextField alloc] initWithFrame:NSMakeRect(myWidth-textWidth, (textSize-textHeight)/7, textWidth, textHeight)];
-        [[self contentView] addSubview:durationField];
-        [durationField setStringValue:@""];
-        [durationField setTextColor:[NSColor whiteColor]];
-        [durationField setBackgroundColor:[NSColor blackColor]];
-        [durationField setFont:newFont];
-        [durationField setBezeled:NO];
-        [durationField setBordered:NO];
-        [durationField setSelectable:NO];
-        
-        playView = [[CMPDVDPlayerPlayHeadView alloc] initWithFrame:NSMakeRect(textWidth + textBuffer, textHeight / 5, myWidth-textWidth*2-textBuffer*2, textHeight * 3 /5)];
-        [[self contentView] addSubview:playView];
-        [self setFrame:NSMakeRect(contentRect.size.width * 5 / 64, textHeight*2, myWidth, textHeight) display:NO];
-        
-        return self;
-}
-
-- (void) dealloc
-{
-        [durationField release];
-        [player release];
-        [playView release];
-        [updateTimer invalidate];
-        [super dealloc];
-}
-
-NSString *timeStringForTime(int time)
-{
-        int seconds = time % 60;
-        time /= 60;
-        int minutes = time % 60;
-        time /= 60;
-        int hours = time;
-        
-        if(hours == 0)
-                return [NSString stringWithFormat:@"%d:%02d", minutes, seconds];
-        
-        return [NSString stringWithFormat:@"%d:%02d:%02d", hours, minutes, seconds];
-}
-
-- (void)close
-{
-        [updateTimer invalidate];
-        updateTimer = nil;
-        [super close];
-}
-
-- (void)updateDisplay
-{
-        int elapsedTime = [player titleElapsedTime];
-        int durationTime = [player titleDurationTime];
-        
-        [elapsedField setStringValue:timeStringForTime(elapsedTime)];
-        [durationField setStringValue:timeStringForTime(durationTime)];
-        [playView setPlayHeadLocation:((float)elapsedTime)/((float)durationTime)];
-}
-
-- (void)setPlayer:(CMPDVDPlayer *)aPlayer
-{
-        [player release];
-        player = [aPlayer retain];
-        
-        [self updateDisplay];
-        
-        [updateTimer invalidate];
-        updateTimer = [NSTimer scheduledTimerWithTimeInterval:1 target:self selector:@selector(updateDisplay) userInfo:nil repeats:YES];
-}
-
-@end
-
-@interface CMPDVDSelectionView : NSView
-{
-        NSTimer                 *moveTimer;
-        float                   initialY, finalY;
-        NSDate                  *startTime;
-}
-@end
-
-@implementation CMPDVDSelectionView
-
-#define CMPDVDSelectionViewMoveTime 0.2
-
-- (id)initWithFrame:(NSRect)frame
-{
-        self = [super initWithFrame:frame];
-        if(!self)
-                return self;
-        
-        initialY = finalY = frame.origin.y;
-        
-        return self;
-}
-
-- (void)dealloc
-{
-        [moveTimer invalidate];
-        [startTime release];
-        [super dealloc];
-}
-
-void Interpolate (void* info, float const* inData, float* outData)
-{
-        float value = sin(M_PI_2 * inData[0])/2;
-        outData[0] = value;
-        outData[1] = value;
-        outData[2] = value;
-        outData[3] = 1.0;
-}
-
-- (void)drawRect:(NSRect)rect
-{
-        NSRect frame = [self frame];
-        NSRect drawPath = frame;
-        drawPath.origin.x = frame.size.height/8;
-        drawPath.origin.y = frame.size.height/8;
-        drawPath.size.width -= frame.size.height/4;
-        drawPath.size.height -= frame.size.height/4;
-        NSBezierPath *path = [NSBezierPath bezierPathWithRect:drawPath];
-        
-        NSShadow *theShadow = [[NSShadow alloc] init];
-        [theShadow setShadowOffset:NSMakeSize(0, 0)];
-        [theShadow setShadowBlurRadius:frame.size.height/8];
-        [theShadow setShadowColor:[NSColor blueColor]];
-        [NSGraphicsContext saveGraphicsState];
-        [theShadow set];
-        [[NSColor blueColor] set];
-        [path fill];
-        
-        [NSGraphicsContext restoreGraphicsState];
-        [theShadow release];
-
-        [[NSColor blackColor] set];
-        NSRectFill(drawPath);
-        
-        //Gradient
-        struct CGFunctionCallbacks callbacks = { 0, Interpolate, NULL };
-        
-        CGFunctionRef function = CGFunctionCreate(NULL, 1, NULL, 4, NULL, &callbacks);
-        CGColorSpaceRef cspace = CGColorSpaceCreateDeviceRGB();
-        
-        CGPoint start = CGPointMake(drawPath.origin.x, drawPath.origin.y + drawPath.size.height);
-        CGPoint end = CGPointMake(drawPath.origin.x, drawPath.origin.y + drawPath.size.height/2);
-        CGShadingRef shading = CGShadingCreateAxial(cspace, start, end, function, false, false);
-        
-        CGContextRef context = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
-        CGContextSaveGState(context);
-        CGContextClipToRect(context, CGRectMake(drawPath.origin.x, drawPath.origin.y, drawPath.size.width, drawPath.size.height));
-        CGContextDrawShading(context, shading);
-        CGContextRestoreGState(context);
-        
-        CGShadingRelease(shading);
-        CGColorSpaceRelease(cspace);
-        CGFunctionRelease(function);
-        [[NSColor blackColor] set];
-        [path stroke];
-}
-
-- (void)moveTimerFire
-{
-        double interval = -[startTime timeIntervalSinceNow];
-        float currentY;
-        if(interval > CMPDVDSelectionViewMoveTime)
-        {
-                currentY = finalY;
-                [moveTimer invalidate];
-                moveTimer = nil;
-        }
-        else
-                currentY = initialY + (finalY - initialY) * interval / CMPDVDSelectionViewMoveTime;
-        NSRect frame = [self frame];
-        NSRect newFrame = frame;
-        newFrame.origin.y = currentY;
-        [self setFrame:newFrame];
-        [[self superview] setNeedsDisplayInRect:frame];
-        [self setNeedsDisplay:YES];
-}
-
-- (void)animateMoveToYDelta:(float)newY
-{
-        [moveTimer invalidate];
-        finalY += newY;
-        initialY = [self frame].origin.y;
-        [startTime release];
-        startTime = [[NSDate date] retain];
-        moveTimer = [NSTimer scheduledTimerWithTimeInterval:ANIMATE_TIME_INTERVAL target:self selector:@selector(moveTimerFire) userInfo:nil repeats:YES];
-}
-
-@end
-
-
-
-@implementation CMPDVDBlurredMenu
-
-- (id)initWithItems:(NSArray*)anItems contentRect:(NSRect)contentRect overWindow:(int)windowID
-{
-        self = [super initWithContentRect:contentRect overWindow:windowID];
-        if(!self)
-                return self;
-        
-        imageView = [[NSImageView alloc] initWithFrame:contentRect];
-        [[self contentView] addSubview:imageView];
-        
-        NSMutableArray *items = [[NSMutableArray alloc] init];
-        
-        int itemCount = [anItems count];
-        itemHeight = contentRect.size.height / 12;
-        int itemWidth = itemHeight * 10;
-        int bottom = (contentRect.size.height - itemHeight * itemCount) / 2;
-        int left = (contentRect.size.width - itemWidth) / 2;
-        
-        float inset = contentRect.size.height * 5 / 144;
-        float borderSize = contentRect.size.height / 72;
-        selectionView = [[CMPDVDSelectionView alloc] initWithFrame:NSMakeRect(left, bottom + itemHeight * (itemCount-1) - borderSize, itemWidth, itemHeight+borderSize*2)];
-        [[self contentView] addSubview:selectionView];
-        
-        NSFont *newFont = nil;
-        for(int i=0; i<itemCount; i++)
-        {
-                NSTextField *menuItem = [[NSTextField alloc] initWithFrame:NSMakeRect(left+inset, bottom+itemHeight*(itemCount-1-i), itemWidth-inset, itemHeight)];
-                [menuItem setStringValue:[anItems objectAtIndex:i]];
-                [[self contentView] addSubview:menuItem];
-                [menuItem setTextColor:[NSColor whiteColor]];
-                [menuItem setDrawsBackground:NO];
-                [menuItem setBezeled:NO];
-                [menuItem setBordered:NO];
-                [menuItem setSelectable:NO];
-                if(newFont == nil)
-                {
-                        NSFont *font = [menuItem font];
-                        newFont = [NSFont fontWithName:[font fontName] size:contentRect.size.height / 20];
-                }
-                [menuItem setFont:newFont];
-                
-                [menuItem sizeToFit];
-                NSRect frame = [menuItem frame];
-                frame.origin.y += (itemHeight - frame.size.height) / 2;
-                [menuItem setFrame:frame];
-                
-                [items addObject:menuItem];
-                [menuItem release];
-        }
-        
-        menuItems = [items copy];
-        [items release];
-        
-        [self setFrame:contentRect display:YES];
-        
-        return self;
-}
-
-- (void) dealloc
-{
-        [menuItems release];
-        [selectionView release];
-        [imageView release];
-        [super dealloc];
-}
-
-
-- (void)display
-{
-        if(!overWindowID)
-                return;
-        CGSConnectionID cid = _CGSDefaultConnection();
-        CGRect bounds;
-        CGSGetWindowBounds(cid, overWindowID, &bounds);
-        //NSLog(@"Bounds is %fx%f - %fx%f", bounds.origin.x, bounds.origin.y, bounds.size.width, bounds.size.height);
-        //      CGLGetCurrentContext()
-        //NSLog(@"bounds is %fx%f-%fx%f", bounds.origin.x, bounds.origin.y, bounds.size.width, bounds.size.height);
-        CGRect imageBounds = bounds;
-        if(bounds.size.height > 480 || bounds.size.width > 720)
-        {
-                float py = bounds.size.height / 480;
-                float px = bounds.size.width / 720;
-                float divisor = MIN(py, px);
-                imageBounds.size.width = floorf(imageBounds.size.width / divisor);
-                imageBounds.size.height = floorf(imageBounds.size.height / divisor);
-        }
-        int bitmapSize = imageBounds.size.width *imageBounds.size.height * 4;
-        char *bitmap = malloc(bitmapSize);
-        CGColorSpaceRef colorspace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB);
-        CGContextRef context = CGBitmapContextCreate(bitmap, imageBounds.size.width, imageBounds.size.height, 8, imageBounds.size.width * 4, colorspace, kCGImageAlphaNoneSkipFirst);
-    // Copy the contents of the window to the graphic context
-        CGContextCopyWindowCaptureContentsToRect(context, imageBounds, cid, overWindowID, 0);   
-        
-        NSData *bitmapData = [NSData dataWithBytesNoCopy:bitmap length:bitmapSize];
-        CIImage *myCIImage = [[CIImage alloc] initWithBitmapData:bitmapData bytesPerRow:imageBounds.size.width * 4 size:imageBounds.size format:kCIFormatARGB8 colorSpace:colorspace];
-        CIFilter *gaussianBlur = [CIFilter filterWithName:@"CIGaussianBlur"];
-        [gaussianBlur setDefaults];
-        [gaussianBlur setValue:myCIImage forKey:@"inputImage"];
-        [myCIImage release];
-        
-        CIImage *result = [gaussianBlur valueForKey:@"outputImage"];
-        CIFilter *crop = [CIFilter filterWithName:@"CICrop"];
-        [crop setDefaults];
-        [crop setValue:result forKey:@"inputImage"];
-        [crop setValue:[CIVector vectorWithX:0 Y:0 Z:imageBounds.size.width W:imageBounds.size.height] forKey:@"inputRectangle"];
-        result = [crop valueForKey:@"outputImage"];
-        NSImage *resultAsNSImage;
-        if([result isKindOfClass:[CIImage class]])
-        {
-                resultAsNSImage = [[NSImage alloc] initWithSize:NSMakeSize([result extent].size.width, [result extent].size.height)];
-                [resultAsNSImage addRepresentation:[NSCIImageRep imageRepWithCIImage:result]];
-                [resultAsNSImage autorelease];
-        }
-        else
-                resultAsNSImage = (NSImage *)result;
-        
-        [resultAsNSImage setScalesWhenResized:YES];
-        [resultAsNSImage setSize:NSMakeSize(bounds.size.width, bounds.size.height)];
-        [imageView setImage:resultAsNSImage];
-        [imageView setImageScaling:NSScaleProportionally];
-        
-        CGContextRelease(context);
-        CGColorSpaceRelease(colorspace);
-        
-        [super display];
-}
-
-- (BOOL)previousItem
-{
-        if(selectedItem == 0)
-                return NO;
-        [selectionView animateMoveToYDelta:itemHeight];
-        selectedItem--;
-        return YES;
-}
-
-- (BOOL)nextItem
-{
-        if(selectedItem == [menuItems count]-1)
-                return NO;
-        [selectionView animateMoveToYDelta:-itemHeight];
-        selectedItem++;
-        return YES;
-}
-
-- (int)selectedItem
-{
-        return selectedItem;
-}
-
-@end
-
-
+#import "CMPOverlayAction.h"
 
 @interface BRDisplayManager (compat)
@@ -611 +44 @@
 //      screenRelease = [[CMPOverlayModeAction alloc] initWithController:controller andSettings:settings];
         screenRelease = [[CMPScreenReleaseAction alloc] initWithController:controller andSettings:settings];
-        overlays = [[NSMutableArray alloc] init];
         
         return self;
@@ -619 +51 @@
 {
         [screenRelease release];
+        [overlayAction release];
         [dvdWindow release];
-        [overlays release];
         [super dealloc];
 }
@@ -690 +122 @@
     CGContextFlush(ctx);
     CGContextRelease(ctx);
+        
+        overlayAction = [[CMPOverlayAction alloc] initWithController:nil andSettings:[NSDictionary dictionaryWithObjectsAndKeys:dvdWindow, CMPOverlayActionWindowKey, nil]];
+        [overlayAction openWithError:nil];
                 
         OSStatus setWindowErr = DVDSetVideoWindowID(dvdWindowID);
@@ -706 +141 @@
 }
 
-- (CMPDVDOverlayWindow *)addBlackShieldWindow
+- (CMPOverlayAction *)overlayAction
 {
-        CMPDVDOverlayWindow *ret = [[CMPDVDOverlayWindow alloc] initWithContentRect:[dvdWindow frame] overWindow:[dvdWindow windowNumber]];
-        
-        [overlays addObject:ret];
-        [ret release];
-        
-        return ret;
-}
-
-- (CMPDVDTextView *)addTextOverlayInPosition:(CMPDVDOverlayPosition)position
-{
-        CMPDVDTextView *ret = [[CMPDVDTextView alloc] initWithContentRect:[dvdWindow frame] position:position overWindow:[dvdWindow windowNumber]];
-        
-        [overlays addObject:ret];
-        [ret release];
-        
-        return ret;
-}
-
-- (CMPDVDPlayerPlayHead *)addPlayheadOverlay
-{
-        CMPDVDPlayerPlayHead *ret = [[CMPDVDPlayerPlayHead alloc] initWithContentRect:[dvdWindow frame] overWindow:[dvdWindow windowNumber]];
-        
-        [overlays addObject:ret];
-        [ret release];
-        
-        return ret;
-}
-
-- (CMPDVDBlurredMenu *)addBlurredMenuOverlayWithItems:(NSArray *)items
-{
-        CMPDVDBlurredMenu *ret = [[CMPDVDBlurredMenu alloc] initWithItems:items contentRect:[dvdWindow frame] overWindow:[dvdWindow windowNumber]];
-        
-        [overlays addObject:ret];
-        [ret release];
-        
-        return ret;
-}
-
-- (void)closeOverlay:(CMPDVDOverlayWindow *)overlay
-{
-        [self closeOverlay:overlay withFade:[NSNumber numberWithFloat:0]];
-}
-
-- (void)closeOverlay:(CMPDVDOverlayWindow *)overlay withFade:(NSNumber *)fadeTimeNumber
-{
-        [overlay closeWithFadeTime:fadeTimeNumber];
-        [overlays removeObject:overlay];
-}
-
-- (void)closeAllOverlays
-{
-        [overlays makeObjectsPerformSelector:@selector(close)];
-        [overlays removeAllObjects];
-}
-
-- (void)closeAllOverlaysWithFadeTime:(float)fadeTime
-{
-        if(fadeTime > 0.0f)
-                [overlays makeObjectsPerformSelector:@selector(closeWithFadeTime:) withObject:[NSNumber numberWithFloat:fadeTime]];
-        else
-                [overlays makeObjectsPerformSelector:@selector(close)];
-        [overlays removeAllObjects];
+        return overlayAction;
 }
 
@@ -778 +152 @@
 //      OSStatus theErr = CGSReleaseWindow(conn, dvdWindowID);
 //      NSLog(@"CGSReleaseWindow: %d", theErr);
-        [self closeAllOverlays];
         [dvdWindow close];
+        [overlayAction closeWithError:error];
         
         return [screenRelease closeWithError:error];