[vlc-devel] commit: Backport [f5f7c36c4351a71129e4d2f6e6a1d03823387713] and announce it ( Felix Paul Kühne )

[git version control]

vlc | branch: 0.8.6-bugfix | Felix Paul Kühne <fkuehne at videolan.org> | Mon May 12 18:53:12 2008 +0200| [ec8cc524d05218d4cc22adc9c6dc965c640c52f1]

Backport [f5f7c36c4351a71129e4d2f6e6a1d03823387713] and announce it

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

 NEWS                      |    6 ++++--
 modules/gui/macosx/vout.m |    8 +++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 45e6473..71b93c0 100644
--- a/NEWS
+++ b/NEWS
@@ -7,9 +7,11 @@ Security updates:
 
 Various bugfixes:
  * Fixed various memory leaks, improving stability when running as a server
- * Fix compilation with recent versions of FFmpeg
+ * Fixed compilation with recent versions of FFmpeg
  * Correctly parses SAP announcements from MPEG-TS
- * Fix AAC resampling
+ * Fixed AAC resampling
+ * The Fullscreen Controller appears correctly on Mac OS X, 
+   if the 'Always-on-top' video option was selected.
 
 
 Changes between 0.8.6e and 0.8.6f:
diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m
index 64418ec..e8c42ce 100644
--- a/modules/gui/macosx/vout.m
+++ b/modules/gui/macosx/vout.m
@@ -2,7 +2,7 @@
  * vout.m: MacOS X video output module
  *****************************************************************************
  * Copyright (C) 2001-2007 the VideoLAN team
- * $Id$
+ * $Id: 64418ec10f98f42f8f3fe48e0989d2b2c0395b1a $
  *
  * Authors: Colin Delacroix <colin at zoy.org>
  *          Florian G. Pflug <fgp at phlo.org>
@@ -744,12 +744,18 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
 
 - (void)enterFullscreen
 {
+    if( var_GetBool( p_real_vout, "video-on-top" ) )
+        [o_window setLevel: NSNormalWindowLevel];
+
     [[o_view class] performSelectorOnMainThread:@selector(resetVout:) withObject:[NSValue valueWithPointer:p_vout] waitUntilDone:YES];
     [[[[VLCMain sharedInstance] getControls] getFSPanel] setActive: nil];
 }
 
 - (void)leaveFullscreen
 {
+    if( var_GetBool( p_real_vout, "video-on-top" ) )
+        [o_window setLevel: NSStatusWindowLevel];
+
     [[o_view class] performSelectorOnMainThread:@selector(resetVout:) withObject:[NSValue valueWithPointer:p_vout] waitUntilDone:YES];
     [[[[VLCMain sharedInstance] getControls] getFSPanel] setNonActive: nil];
 }