macosx: added CoreAnimation based transitions to display the Drop Zone, switch...

macosx: added CoreAnimation based transitions to display the Drop Zone, switch between optical media and input devices

replaced the sprefs panel's legacy animation with basic CA effects

modules/gui/macosx/MainWindow.m

@@ -205,13 +205,13 @@ static VLCMainWindow *_o_sharedInstance = nil;
     [o_play_btn setAlternateImage: o_play_pressed_img];
 
     /* interface builder action */
-    [o_video_view setFrame: [o_split_view frame]];
     [self setDelegate: self];
     [self setExcludedFromWindowsMenu: YES];
     // Set that here as IB seems to be buggy
     [self setContentMinSize:NSMakeSize(400., 288.)];
     [self setTitle: _NS("VLC media player")];
     [o_playlist_btn setEnabled:NO];
+    [o_video_view setFrame: [o_split_view frame]];
 
     /* reset the interface */
     [self updateVolumeSlider];
@@ -414,13 +414,13 @@ static VLCMainWindow *_o_sharedInstance = nil;
 - (IBAction)togglePlaylist:(id)sender
 {
     if ([o_video_view isHidden] && [o_playlist_btn isEnabled]) {
-        [o_video_view setHidden: NO];
         [o_playlist_table setHidden: YES];
+        [o_video_view setHidden: NO];
     }
     else
     {
-        [o_playlist_table setHidden: NO];
         [o_video_view setHidden: YES];
+        [o_playlist_table setHidden: NO];
     }
 }
 
@@ -568,15 +568,15 @@ static VLCMainWindow *_o_sharedInstance = nil;
 #pragma mark Update interface and respond to foreign events
 - (void)showDropZone
 {
-    [o_playlist_table setHidden:YES];
-    [o_dropzone_view setFrame: [o_playlist_table frame]];
     [o_right_split_view addSubview: o_dropzone_view];
+    [[o_dropzone_view animator] setFrame: [o_playlist_table frame]];
+    [[o_playlist_table animator] setHidden:YES];
 }
 
 - (void)hideDropZone
 {
-    [o_playlist_table setHidden: NO];
     [o_dropzone_view removeFromSuperview];
+    [[o_playlist_table animator] setHidden: NO];
 }
 
 - (void)updateTimeSlider

modules/gui/macosx/open.h

@@ -60,7 +60,6 @@
     IBOutlet id o_file_subtitles_icon_well;
 
     /* open disc */
-    IBOutlet id o_disc_icon_well;
     IBOutlet id o_disc_selector_pop;
 
     IBOutlet id o_disc_nodisc_view;
@@ -214,6 +213,7 @@
     BOOL b_autoplay;
     BOOL b_nodvdmenus;
     id o_currentOpticalMediaView;
+    id o_currentOpticalMediaIconView;
     NSMutableArray *o_opticalDevices;
     NSMutableArray *o_specialMediaFolders;
     NSString *o_file_path;

modules/gui/macosx/open.m

@@ -97,6 +97,8 @@ static VLCOpen *_o_sharedMainInstance = nil;
     if( o_file_slave_path )
         [o_file_slave_path release];
     [o_mrl release];
+    [o_currentOpticalMediaIconView release];
+    [o_currentOpticalMediaView release];
     [super dealloc];
 }
 
@@ -498,8 +500,8 @@ static VLCOpen *_o_sharedMainInstance = nil;
         o_win_rect.size.height = o_win_rect.size.height + o_view_rect.size.height;
     }
 
-    [o_panel setFrame: o_win_rect display:YES animate: YES];
-    [o_panel displayIfNeeded];
+    [[o_panel animator] setFrame: o_win_rect display:YES];
+//    [o_panel displayIfNeeded];
     if( [o_mrl_btn state] == NSOnState )
         [[o_panel contentView] addSubview: o_mrl_view];
 }
@@ -635,22 +637,36 @@ static VLCOpen *_o_sharedMainInstance = nil;
     [self openFilePathChanged: nil];
 }
 
-- (void)showOpticalMediaView: theView
+- (void)showOpticalMediaView: theView withIcon:(NSImage *)icon
 {
     NSRect o_view_rect;
     o_view_rect = [theView frame];
-    if( o_currentOpticalMediaView )
+    [theView setFrame: NSMakeRect( 233, 0, o_view_rect.size.width, o_view_rect.size.height)];
+    [theView setAutoresizesSubviews: YES];
+    if (o_currentOpticalMediaView)
     {
-        [o_currentOpticalMediaView removeFromSuperviewWithoutNeedingDisplay];
+        [[[[o_tabview tabViewItemAtIndex: [o_tabview indexOfTabViewItemWithIdentifier:@"optical"]] view] animator] replaceSubview: o_currentOpticalMediaView with: theView];
         [o_currentOpticalMediaView release];
     }
-    [theView setFrame: NSMakeRect( 233, 0, o_view_rect.size.width, o_view_rect.size.height)];
-    [theView setNeedsDisplay: YES];
-    [theView setAutoresizesSubviews: YES];
-    [[[o_tabview tabViewItemAtIndex: [o_tabview indexOfTabViewItemWithIdentifier:@"optical"]] view] addSubview: theView];
-    [theView displayIfNeeded];
+    else
+        [[[[o_tabview tabViewItemAtIndex: [o_tabview indexOfTabViewItemWithIdentifier:@"optical"]] view] animator] addSubview: theView];
     o_currentOpticalMediaView = theView;
     [o_currentOpticalMediaView retain];
+
+    NSImageView *imageView;
+    imageView = [[NSImageView alloc] init];
+    [imageView setFrame: NSMakeRect( 53, 61, 128, 128 )];
+    [icon setSize: NSMakeSize(128,128)];
+    [imageView setImage: icon];
+    if (o_currentOpticalMediaIconView)
+    {
+        [[[[o_tabview tabViewItemAtIndex: [o_tabview indexOfTabViewItemWithIdentifier:@"optical"]] view] animator] replaceSubview: o_currentOpticalMediaIconView with: imageView];
+        [o_currentOpticalMediaIconView release];
+    }
+    else
+         [[[[o_tabview tabViewItemAtIndex: [o_tabview indexOfTabViewItemWithIdentifier:@"optical"]] view] animator] addSubview: imageView];
+    o_currentOpticalMediaIconView = imageView;
+    [o_currentOpticalMediaIconView retain];
 }
 
 - (NSString *) getBSDNodeFromMountPath:(NSString *)mountPath
@@ -767,7 +783,6 @@ static VLCOpen *_o_sharedMainInstance = nil;
     {
         [o_disc_dvd_lbl setStringValue: [[NSFileManager defaultManager] displayNameAtPath:[o_opticalDevices objectAtIndex: index]]];
         [o_disc_dvdwomenus_lbl setStringValue: [o_disc_dvd_lbl stringValue]];
-        [o_disc_icon_well setImage: [[NSWorkspace sharedWorkspace] iconForFile: [o_opticalDevices objectAtIndex: index]]];
         NSString *pathToOpen;
         if (diskType == kVLCMediaVideoTSFolder)
             pathToOpen = [o_opticalDevices objectAtIndex: index];
@@ -775,32 +790,29 @@ static VLCOpen *_o_sharedMainInstance = nil;
             pathToOpen = [self getBSDNodeFromMountPath:[o_opticalDevices objectAtIndex: index]];
         if (!b_nodvdmenus) {
             [self setMRL: [NSString stringWithFormat: @"dvdnav://%@", pathToOpen]];
-            [self showOpticalMediaView: o_disc_dvd_view];
+            [self showOpticalMediaView: o_disc_dvd_view withIcon: [[NSWorkspace sharedWorkspace] iconForFile: [o_opticalDevices objectAtIndex: index]]];
         } else {
             [self setMRL: [NSString stringWithFormat: @"dvdread://%@@%i:%i-", pathToOpen, [o_disc_dvdwomenus_title intValue], [o_disc_dvdwomenus_chapter intValue]]];
-            [self showOpticalMediaView: o_disc_dvdwomenus_view];
+            [self showOpticalMediaView: o_disc_dvdwomenus_view withIcon: [[NSWorkspace sharedWorkspace] iconForFile: [o_opticalDevices objectAtIndex: index]]];
         }
     }
     else if (diskType == kVLCMediaAudioCD)
     {
         [o_disc_audiocd_lbl setStringValue: [[NSFileManager defaultManager] displayNameAtPath:[o_opticalDevices objectAtIndex: index]]];
         [o_disc_audiocd_trackcount_lbl setStringValue: [NSString stringWithFormat:_NS("%i tracks"), [[[NSFileManager defaultManager] subpathsOfDirectoryAtPath: [o_opticalDevices objectAtIndex: index] error:NULL] count] - 1]]; // minus .TOC.plist
-        [self showOpticalMediaView: o_disc_audiocd_view];
-        [o_disc_icon_well setImage: [[NSWorkspace sharedWorkspace] iconForFile: [o_opticalDevices objectAtIndex: index]]];
+        [self showOpticalMediaView: o_disc_audiocd_view withIcon: [[NSWorkspace sharedWorkspace] iconForFile: [o_opticalDevices objectAtIndex: index]]];
         [self setMRL: [NSString stringWithFormat: @"cdda://%@", [self getBSDNodeFromMountPath:[o_opticalDevices objectAtIndex: index]]]];
     }
     else if (diskType == kVLCMediaVCD || diskType == kVLCMediaSVCD)
     {
         [o_disc_vcd_lbl setStringValue: [[NSFileManager defaultManager] displayNameAtPath:[o_opticalDevices objectAtIndex: index]]];
-        [self showOpticalMediaView: o_disc_vcd_view];
-        [o_disc_icon_well setImage: [[NSWorkspace sharedWorkspace] iconForFile: [o_opticalDevices objectAtIndex: index]]];
+        [self showOpticalMediaView: o_disc_vcd_view withIcon: [[NSWorkspace sharedWorkspace] iconForFile: [o_opticalDevices objectAtIndex: index]]];
         [self setMRL: [NSString stringWithFormat: @"vcd://%@@%i:%i", [self getBSDNodeFromMountPath:[o_opticalDevices objectAtIndex: index]], [o_disc_vcd_title intValue], [o_disc_vcd_chapter intValue]]];
     }
     else if (diskType == kVLCMediaBD || diskType == kVLCMediaBDMVFolder)
     {
         [o_disc_bd_lbl setStringValue: [[NSFileManager defaultManager] displayNameAtPath:[o_opticalDevices objectAtIndex: index]]];
-        [self showOpticalMediaView: o_disc_bd_view];
-        [o_disc_icon_well setImage: [[NSWorkspace sharedWorkspace] iconForFile: [o_opticalDevices objectAtIndex: index]]];
+        [self showOpticalMediaView: o_disc_bd_view withIcon: [[NSWorkspace sharedWorkspace] iconForFile: [o_opticalDevices objectAtIndex: index]]];
         if (diskType == kVLCMediaBD)
             [self setMRL: [NSString stringWithFormat: @"bluray://%@", [self getBSDNodeFromMountPath:[o_opticalDevices objectAtIndex: index]]]];
         else
@@ -809,11 +821,9 @@ static VLCOpen *_o_sharedMainInstance = nil;
     else
     {
         msg_Warn( VLCIntf, "unknown disk type, no idea what to display" );
-        [o_disc_icon_well setImage: [NSImage imageNamed:@"NSApplicationIcon"]];
-        [self showOpticalMediaView: o_disc_nodisc_view];
+        [self showOpticalMediaView: o_disc_nodisc_view withIcon: [NSImage imageNamed:@"NSApplicationIcon"]];
     }
 
-    [[o_disc_icon_well image] setSize: NSMakeSize(128,128)];
     [o_pool release];
 }
 
@@ -839,8 +849,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
     {
         msg_Dbg( VLCIntf, "no optical media found" );
         [o_disc_selector_pop setHidden: YES];
-        [o_disc_icon_well setImage: [NSImage imageNamed: @"NSApplicationIcon"]];
-        [self showOpticalMediaView: o_disc_nodisc_view];
+        [self showOpticalMediaView: o_disc_nodisc_view withIcon: [NSImage imageNamed: @"NSApplicationIcon"]];
     }
 }
 
@@ -881,12 +890,12 @@ static VLCOpen *_o_sharedMainInstance = nil;
     if (sender == o_disc_dvdwomenus_enablemenus_btn) {
         b_nodvdmenus = NO;
         [self setMRL: [NSString stringWithFormat: @"dvdnav://%@", [self getBSDNodeFromMountPath:[o_opticalDevices objectAtIndex: [o_disc_selector_pop indexOfSelectedItem]]]]];
-        [self showOpticalMediaView: o_disc_dvd_view];
+        [self showOpticalMediaView: o_disc_dvd_view withIcon: [o_currentOpticalMediaIconView image]];
         return;
     }
     if (sender == o_disc_dvd_disablemenus_btn) {
         b_nodvdmenus = YES;
-        [self showOpticalMediaView: o_disc_dvdwomenus_view];
+        [self showOpticalMediaView: o_disc_dvdwomenus_view withIcon: [o_currentOpticalMediaIconView image]];
     }
 
     if (sender == o_disc_dvdwomenus_title)
@@ -1111,16 +1120,15 @@ static VLCOpen *_o_sharedMainInstance = nil;
 {
     NSRect o_view_rect;
     o_view_rect = [theView frame];
-    if( o_currentCaptureView )
+    [theView setFrame: NSMakeRect( 0, -10, o_view_rect.size.width, o_view_rect.size.height)];
+    [theView setAutoresizesSubviews: YES];
+    if (o_currentCaptureView)
     {
-        [o_currentCaptureView removeFromSuperviewWithoutNeedingDisplay];
+        [[[[o_tabview tabViewItemAtIndex: 3] view] animator] replaceSubview: o_currentCaptureView with: theView];
         [o_currentCaptureView release];
     }
-    [theView setFrame: NSMakeRect( 0, -10, o_view_rect.size.width, o_view_rect.size.height)];
-    [theView setNeedsDisplay: YES];
-    [theView setAutoresizesSubviews: YES];
-    [[[o_tabview tabViewItemAtIndex: 3] view] addSubview: theView];
-    [theView displayIfNeeded];
+    else
+         [[[[o_tabview tabViewItemAtIndex: 3] view] animator] addSubview: theView];
     o_currentCaptureView = theView;
     [o_currentCaptureView retain];
 }

modules/gui/macosx/simple_prefs.m

@@ -939,26 +939,28 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
         o_old_view_rect = [o_currentlyShownCategoryView frame];
         o_win_rect.size.height = o_win_rect.size.height - o_old_view_rect.size.height;
         o_win_rect.origin.y = ( o_win_rect.origin.y + o_old_view_rect.size.height ) - o_view_rect.size.height;
-
-        /* remove our previous category view */
-        [o_currentlyShownCategoryView removeFromSuperviewWithoutNeedingDisplay];
     }
 
     o_win_rect.size.height = o_win_rect.size.height + o_view_rect.size.height;
 
-    [o_sprefs_win displayIfNeeded];
-    [o_sprefs_win setFrame: o_win_rect display:YES animate: YES];
-
     [o_new_category_view setFrame: NSMakeRect( 0,
                                                [o_sprefs_controls_box frame].size.height,
                                                o_view_rect.size.width,
                                                o_view_rect.size.height )];
-    [o_new_category_view setNeedsDisplay: YES];
     [o_new_category_view setAutoresizesSubviews: YES];
-    [[o_sprefs_win contentView] addSubview: o_new_category_view];
+    if (o_currentlyShownCategoryView)
+    {
+        [[[o_sprefs_win contentView] animator] replaceSubview: o_currentlyShownCategoryView with: o_new_category_view];
+        [o_currentlyShownCategoryView release];
+        [[o_sprefs_win animator] setFrame: o_win_rect display:YES];
+    }
+    else
+    {
+        [[o_sprefs_win contentView] addSubview: o_new_category_view];
+        [o_sprefs_win setFrame: o_win_rect display:YES animate:NO];
+    }
 
     /* keep our current category for further reference */
-    [o_currentlyShownCategoryView release];
     o_currentlyShownCategoryView = o_new_category_view;
     [o_currentlyShownCategoryView retain];
 }