[vlc-commits] macosx: fixed some ui bugs, which sneaked in recently

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Mon Aug 15 00:20:29 2011 +0200| [dd7b5f129efa741bdec13f717b8395c8e8f0e830] | committer: Felix Paul Kühne

macosx: fixed some ui bugs, which sneaked in recently

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dd7b5f129efa741bdec13f717b8395c8e8f0e830
---

 modules/gui/macosx/MainWindow.m |    7 ++++---
 modules/video_output/macosx.m   |    2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index c361c23..b0aa59c 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -424,7 +424,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
     else
     {
         [o_playlist_table setHidden: NO];
-        [o_video_view setHidden: NO];
+        [o_video_view setHidden: ![[VLCMain sharedInstance] activeVideoPlayback]];
     }
 }
 
@@ -669,7 +669,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
         if ([o_url isFileURL])
             [self setRepresentedURL: o_url];
         else
-            [self setRepresentedURL: [NSURL URLWithString:@""]];
+            [self setRepresentedURL: nil];
         free( uri );
 
         if ([aString isEqualToString:@""])
@@ -686,7 +686,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
     else
     {
         [self setTitle: _NS("VLC media player")];
-        [self setRepresentedURL: [NSURL URLWithString: @""]];
+        [self setRepresentedURL: nil];
     }
     [o_pool release];
 }
@@ -1150,6 +1150,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
     }
 
     [self setAlphaValue: 0.0];
+    [self orderFront: self];
     [[o_video_view window] orderFront: self];
 
     [o_fspanel setNonActive: nil];
diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index 553890e..d1f0df9 100644
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -314,7 +314,7 @@ static int Control (vout_display_t *vd, int query, va_list ap)
         }
         case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED:
         {
-            [[sys->glView window] performSelectorOnMainThread:@selector(performZoom:) withObject: nil waitUntilDone:NO];
+            [[sys->glView window] performSelectorOnMainThread:@selector(zoom:) withObject: nil waitUntilDone:NO];
             return VLC_SUCCESS;
         }
         case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE: