Changeset 1142 for branches

Show
Ignore:
Timestamp:
02/18/10 16:12:23 (2 years ago)
Author:
gbooker
Message:

Made playhead smaller to be more consistent with Apple's, made blue color lighter, made elapsed and duration text white, and fixed test routine for new init routine.

Location:
branches/PlayerFramework/CommonMediaPlayer
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/PlayerFramework/CommonMediaPlayer/Media Players/DVD Framework/CMPDVDWindowCreationAction.m

    r1140 r1142  
    139139        [[self contentView] addSubview:textField]; 
    140140        [textField setStringValue:@""]; 
    141         [textField setTextColor:[NSColor blueColor]]; 
     141        [textField setTextColor:[NSColor colorWithDeviceHue:227.0f/360.0f saturation:.60f brightness:1 alpha:1]]; 
    142142        [textField setBackgroundColor:[NSColor blackColor]]; 
    143143        NSFont *font = [textField font]; 
    … …  
    201201        [path appendBezierPathWithArcWithCenter:NSMakePoint(width-height/2, height/2) radius:height/2 startAngle:270 endAngle:90]; 
    202202        [path closePath]; 
    203         [[NSColor colorWithDeviceRed:0.25 green:0.25 blue:1 alpha:1] set]; 
     203        [[NSColor colorWithDeviceHue:227.0f/360.0f saturation:.60f brightness:1 alpha:1] set]; 
    204204        [path fill]; 
    205205         
    206206        path = [NSBezierPath bezierPath]; 
    207207        float position = playHeadLocation * (width - height) + height/2; 
    208         [path moveToPoint:NSMakePoint(position, 0)]; 
    209         [path lineToPoint:NSMakePoint(position-height/2, height/2)]; 
    210         [path lineToPoint:NSMakePoint(position, height)]; 
    211         [path lineToPoint:NSMakePoint(position+height/2, height/2)]; 
     208        float border = height / 20; 
     209        [path moveToPoint:NSMakePoint(position, border)]; 
     210        [path lineToPoint:NSMakePoint(position-height/2+border, height/2)]; 
     211        [path lineToPoint:NSMakePoint(position, height-border)]; 
     212        [path lineToPoint:NSMakePoint(position+height/2-border, height/2)]; 
    212213        [path closePath]; 
    213214        [[NSColor blackColor] set]; 
    … …  
    233234         
    234235        float myWidth = contentRect.size.width * 27 / 32; 
    235         float textHeight = contentRect.size.height * 5 / 72; 
     236        float textHeight = contentRect.size.height * 3 / 72; 
    236237        float textWidth = textHeight * 3; 
    237         float textSize = contentRect.size.height / 20; 
     238        float textBuffer = textHeight / 2; 
     239        float textSize = contentRect.size.height / 33; 
    238240        elapsedField = [[NSTextField alloc] initWithFrame:NSMakeRect(0, (textSize-textHeight)/7, textWidth, textHeight)]; 
    239241        [[self contentView] addSubview:elapsedField]; 
    240242        [elapsedField setStringValue:@""]; 
    241         [elapsedField setTextColor:[NSColor blueColor]]; 
     243        [elapsedField setTextColor:[NSColor whiteColor]]; 
    242244        [elapsedField setBackgroundColor:[NSColor blackColor]]; 
    243245        NSFont *font = [elapsedField font]; 
    … …  
    252254        [[self contentView] addSubview:durationField]; 
    253255        [durationField setStringValue:@""]; 
    254         [durationField setTextColor:[NSColor blueColor]]; 
     256        [durationField setTextColor:[NSColor whiteColor]]; 
    255257        [durationField setBackgroundColor:[NSColor blackColor]]; 
    256258        [durationField setFont:newFont]; 
    … …  
    259261        [durationField setSelectable:NO]; 
    260262         
    261         playView = [[CMPDVDPlayerPlayHeadView alloc] initWithFrame:NSMakeRect(textWidth, textHeight / 5, myWidth-textWidth*2, textHeight * 3 /5)]; 
     263        playView = [[CMPDVDPlayerPlayHeadView alloc] initWithFrame:NSMakeRect(textWidth + textBuffer, textHeight / 5, myWidth-textWidth*2-textBuffer*2, textHeight * 3 /5)]; 
    262264        [[self contentView] addSubview:playView]; 
    263265        [self setFrame:NSMakeRect(contentRect.size.width * 5 / 64, textHeight*2, myWidth, textHeight) display:NO]; 

  • branches/PlayerFramework/CommonMediaPlayer/debug_main.m

    r1095 r1142  
    6969        NSApplicationLoad(); 
    7070         
    71 #if 0 
    72         CMPDVDPlayerPlayHead *playhead = [[CMPDVDPlayerPlayHead alloc] initWithContentRect:NSMakeRect(0, 0, 1440, 900) position:CMPDVDOverlayLowerLeft overWindow:0]; 
     71#if 1 
     72        CMPDVDPlayerPlayHead *playhead = [[CMPDVDPlayerPlayHead alloc] initWithContentRect:NSMakeRect(0, 0, 1440, 900) overWindow:0]; 
    7373         
    7474        [playhead setPlayer:[[something alloc] init]]; 
    … …  
    7676#endif 
    7777         
     78#if 0 
    7879        NSArray *items = [NSArray arrayWithObjects:@"Resume Playback", @"Start From Beginning", @"Main Menu", nil]; 
    7980        CMPDVDBlurredMenu *menu = [[CMPDVDBlurredMenu alloc] initWithItems:items contentRect:NSMakeRect(0, 0, 1440, 900) overWindow:0]; 
    … …  
    8182         
    8283        [NSTimer scheduledTimerWithTimeInterval:.2 target:[[something alloc] init] selector:@selector(randomDirection:) userInfo:menu repeats:YES]; 
     84#endif 
    8385                 
    8486        NSRunLoop *currentRL = [NSRunLoop currentRunLoop];