Changeset 1166 for branches/PlayerFramework/CommonMediaPlayer/Media Players/DVD Framework/CMPDVDPlayerController.m

Timestamp:

02/23/10 22:36:05 (2 years ago)

Author:

gbooker

Message:

Added Zoom, and it's overlay along with some simpler methods for determining bounds.

Files:

• branches/PlayerFramework/CommonMediaPlayer/Media Players/DVD Framework/CMPDVDPlayerController.m (modified) (10 diffs)

branches/PlayerFramework/CommonMediaPlayer/Media Players/DVD Framework/CMPDVDPlayerController.m

@@ -145 +145 @@
         [audioOverlay release];
         [chapterOverlay release];
+        [zoomOverlay release];
         [playheadOverlay release];
         [blurredMenu release];
@@ -344 +345 @@
         BOOL closeAudio = (audioOverlay != nil);
         BOOL closeChapter = (chapterOverlay != nil);
+        BOOL closeZoom = (zoomOverlay != nil);
         BOOL closePlayhead = (playheadOverlay != nil);
         
@@ -358 +360 @@
                         closeChapter = NO;
                         closePlayhead = NO;
+                        break;
+                case CMPDVDPlayerControllerOverlayModeZoom:
+                        closeZoom = NO;
                         break;
                 default:
@@ -371 +376 @@
         if(closeChapter)
                 closeAndNilOverlay(windowCreation, &chapterOverlay, fadeTime);
+        if(closeZoom)
+                closeAndNilOverlay(windowCreation, &zoomOverlay, fadeTime);
         if(closePlayhead)
                 closeAndNilOverlay(windowCreation, &playheadOverlay, fadeTime);
@@ -414 +421 @@
 }
 
+- (NSString *)chapterString
+{
+        return [NSString stringWithFormat:@"Chapter %d/%d", [player currentChapter], [player chapters]];
+}
+
 - (void)showChapterMode
 {
@@ -421 +433 @@
         if(!chapterOverlay)
                 chapterOverlay = [[windowCreation addTextOverlayInPosition:CMPDVDOverlayUpperLeft] retain];
-        [chapterOverlay setText:[NSString stringWithFormat:@"Chapter %d/%d", [player currentChapter], [player chapters]]];
+        [chapterOverlay setText:[self chapterString]];
         [chapterOverlay displayWithFadeTime:0.25];
         [self showPlayheadOverlay];
+        
+        [self resetOverlayTimerTo:10];
+}
+
+- (NSString *)zoomModeString
+{
+        switch ([player zoomLevel]) {
+                case CMPDVDZoomLetterBoxInFullFrame:
+                        return @"Zoom: 4/3x";
+                case CMPDVDZoom2x:
+                        return @"Zoom: 2x";
+        }
+        return @"Zoom: None";
+}
+
+- (void)showZoomMode
+{
+        overlayMode = CMPDVDPlayerControllerOverlayModeZoom;
+        [self overlayModeChangedWithFade:0];
+        
+        if(!zoomOverlay)
+                zoomOverlay = [[windowCreation addTextOverlayInPosition:CMPDVDOverlayUpperRight] retain];
+        [zoomOverlay setText:[self zoomModeString]];
+        [zoomOverlay displayWithFadeTime:0.25];
         
         [self resetOverlayTimerTo:10];
@@ -515 +551 @@
                         {
                                 [player nextChapter];
-                                [chapterOverlay setText:[NSString stringWithFormat:@"Chapter %d/%d", [player currentChapter], [player chapters]]];
+                                [chapterOverlay setText:[self chapterString]];
+                                [self resetOverlayTimerTo:10];
+                        }
+                        else if(overlayMode == CMPDVDPlayerControllerOverlayModeZoom)
+                        {
+                                [player setZoomLevel:([player zoomLevel] + 1) % CMPDVDZoomLevelCount];
+                                [zoomOverlay setText:[self zoomModeString]];
                                 [self resetOverlayTimerTo:10];
                         }
@@ -538 +580 @@
                         {
                                 [player previousChapter];
-                                [chapterOverlay setText:[NSString stringWithFormat:@"Chapter %d/%d", [player currentChapter], [player chapters]]];
+                                [chapterOverlay setText:[self chapterString]];
                                 [self resetOverlayTimerTo:10];
                         }
+                        else if(overlayMode == CMPDVDPlayerControllerOverlayModeZoom)
+                                ;
                         else if(playingInSomeForm)
                                 [player decrementScanRate];
@@ -556 +600 @@
                                 [self showSubAndAudioMode];
                         else if(overlayMode == CMPDVDPlayerControllerOverlayModeSubAndAudio)
+                                [self showZoomMode];
+                        else if(overlayMode == CMPDVDPlayerControllerOverlayModeZoom)
                                 overlayMode = CMPDVDPlayerControllerOverlayModeStatus;
                         else if(overlayMode == CMPDVDPlayerControllerOverlayModeChapters)
@@ -572 +618 @@
                         else if(overlayMode == CMPDVDPlayerControllerOverlayModeSubAndAudio)
                                 overlayMode = CMPDVDPlayerControllerOverlayModeStatus;
+                        else if(overlayMode == CMPDVDPlayerControllerOverlayModeZoom)
+                                [self showSubAndAudioMode];
                         else if(overlayMode == CMPDVDPlayerControllerOverlayModeChapters)
                                 overlayMode = CMPDVDPlayerControllerOverlayModeStatus;