]> git.sesse.net Git - vlc/blobdiff - modules/gui/macosx/intf.m
Removes trailing spaces. Removes tabs.
[vlc] / modules / gui / macosx / intf.m
index 1be23df8040d9473999b12f63113a6c00bc431f3..4787ae25115ae875ed790eb0a94c0a6d8c4244f8 100644 (file)
@@ -1,18 +1,19 @@
 /*****************************************************************************
  * intf.m: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2005 the VideoLAN team
+ * Copyright (C) 2002-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
  *          Derk-Jan Hartman <hartman at videolan.org>
+ *          Felix K\9fhne <fkuehne at videolan dot org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -20,7 +21,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
 #include <string.h>
 #include <vlc_keys.h>
 
-#include "intf.h"
-#include "vout.h"
-#include "prefs.h"
-#include "playlist.h"
-#include "controls.h"
-#include "about.h"
-#include "open.h"
-#include "wizard.h"
-#include "extended.h"
-#include "bookmarks.h"
-#include "sfilters.h"
-#include "interaction.h"
-#include "embeddedwindow.h"
-/*#include "update.h"*/
+#import "intf.h"
+#import "fspanel.h"
+#import "vout.h"
+#import "prefs.h"
+#import "playlist.h"
+#import "controls.h"
+#import "about.h"
+#import "open.h"
+#import "wizard.h"
+#import "extended.h"
+#import "bookmarks.h"
+#import "sfilters.h"
+#import "interaction.h"
+#import "embeddedwindow.h"
+#import "update.h"
+#import "AppleRemote.h"
+#import "eyetv.h"
+
+#import <vlc_input.h>
 
 /*****************************************************************************
  * Local prototypes.
@@ -72,10 +78,10 @@ int E_(OpenIntf) ( vlc_object_t *p_this )
      * http://developer.apple.com/techpubs/macosx/Cocoa/
      * TasksAndConcepts/ProgrammingTopics/Multithreading/index.html
      * This thread does absolutely nothing at all. */
-    [NSThread detachNewThreadSelector:@selector(self) toTarget:[NSString string] withObject:nil];
+    //[NSThread detachNewThreadSelector:@selector(self) toTarget:[NSString string] withObject:nil];
 
     p_intf->p_sys->o_sendport = [[NSPort port] retain];
-    p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
+    p_intf->p_sys->p_sub = msg_Subscribe( p_intf, MSG_QUEUE_NORMAL );
     p_intf->b_play = VLC_TRUE;
     p_intf->pf_run = Run;
 
@@ -100,16 +106,32 @@ void E_(CloseIntf) ( vlc_object_t *p_this )
 /*****************************************************************************
  * Run: main loop
  *****************************************************************************/
+jmp_buf jmpbuffer;
+
 static void Run( intf_thread_t *p_intf )
 {
+    sigset_t set;
+
     /* Do it again - for some unknown reason, vlc_thread_create() often
      * fails to go to real-time priority with the first launched thread
      * (???) --Meuuh */
     vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
+
+    /* Make sure the "force quit" menu item does quit instantly.
+     * VLC overrides SIGTERM which is sent by the "force quit"
+     * menu item to make sure deamon mode quits gracefully, so
+     * we un-override SIGTERM here. */
+    sigemptyset( &set );
+    sigaddset( &set, SIGTERM );
+    pthread_sigmask( SIG_UNBLOCK, &set, NULL );
+
     [[VLCMain sharedInstance] setIntf: p_intf];
     [NSBundle loadNibNamed: @"MainMenu" owner: NSApp];
-    [NSApp run];
-    [[VLCMain sharedInstance] terminate];
+
+    /* Install a jmpbuffer to where we can go back before the NSApp exit
+     * see applicationWillTerminate: */
+    if(setjmp(jmpbuffer) == 0)
+        [NSApp run];
 }
 
 int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
@@ -184,9 +206,23 @@ static int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable,
                      vlc_value_t old_val, vlc_value_t new_val, void *param )
 {
     intf_thread_t * p_intf = VLCIntf;
-    p_intf->p_sys->b_playlist_update = TRUE;
-    p_intf->p_sys->b_intf_update = TRUE;
-    p_intf->p_sys->b_playmode_update = TRUE;
+    p_intf->p_sys->b_playlist_update = VLC_TRUE;
+    p_intf->p_sys->b_intf_update = VLC_TRUE;
+    p_intf->p_sys->b_playmode_update = VLC_TRUE;
+    p_intf->p_sys->b_current_title_update = VLC_TRUE;
+    return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * ShowController: Callback triggered by the show-intf playlist variable
+ * through the ShowIntf-control-intf, to let us show the controller-win;
+ * usually when in fullscreen-mode
+ *****************************************************************************/
+static int ShowController( vlc_object_t *p_this, const char *psz_variable,
+                     vlc_value_t old_val, vlc_value_t new_val, void *param )
+{
+    intf_thread_t * p_intf = VLCIntf;
+    p_intf->p_sys->b_intf_show = VLC_TRUE;
     return VLC_SUCCESS;
 }
 
@@ -198,7 +234,7 @@ static int FullscreenChanged( vlc_object_t *p_this, const char *psz_variable,
                      vlc_value_t old_val, vlc_value_t new_val, void *param )
 {
     intf_thread_t * p_intf = VLCIntf;
-    p_intf->p_sys->b_fullscreen_update = TRUE;
+    p_intf->p_sys->b_fullscreen_update = VLC_TRUE;
     return VLC_SUCCESS;
 }
 
@@ -213,10 +249,10 @@ static int InteractCallback( vlc_object_t *p_this, const char *psz_variable,
     VLCMain *interface = (VLCMain *)param;
     interaction_dialog_t *p_dialog = (interaction_dialog_t *)(new_val.p_address);
     NSValue *o_value = [NSValue valueWithPointer:p_dialog];
-    
     [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCNewInteractionEventNotification" object:[interface getInteractionList]
      userInfo:[NSDictionary dictionaryWithObject:o_value forKey:@"VLCDialogPointer"]];
-    
     [o_pool release];
     return VLC_SUCCESS;
 }
@@ -317,7 +353,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     } else {
         _o_sharedMainInstance = [super init];
     }
-    
+
     o_about = [[VLAboutBox alloc] init];
     o_prefs = nil;
     o_open = [[VLCOpen alloc] init];
@@ -327,9 +363,22 @@ static VLCMain *_o_sharedMainInstance = nil;
     o_embedded_list = [[VLCEmbeddedList alloc] init];
     o_interaction_list = [[VLCInteractionList alloc] init];
     o_sfilters = nil;
-    /*o_update = [[VLCUpdate alloc] init];*/
+    o_update = [[VLCUpdate alloc] init];
 
     i_lastShownVolume = -1;
+
+    o_remote = [[AppleRemote alloc] init];
+    [o_remote setClickCountEnabledButtons: kRemoteButtonPlay];
+    [o_remote setDelegate: _o_sharedMainInstance];
+
+    o_eyetv = [[VLCEyeTVController alloc] init];
+
+    /* announce our launch to a potential eyetv plugin */
+    [[NSDistributedNotificationCenter defaultCenter] postNotificationName: @"VLCOSXGUIInit"
+                                                                   object: @"VLCEyeTVSupport"
+                                                                 userInfo: NULL
+                                                       deliverImmediately: YES];
+
     return _o_sharedMainInstance;
 }
 
@@ -415,7 +464,8 @@ static VLCMain *_o_sharedMainInstance = nil;
     [self setSubmenusEnabled: FALSE];
     [self manageVolumeSlider];
     [o_window setDelegate: self];
-    
+    b_restore_size = false;
     if( [o_window frame].size.height <= 200 )
     {
         b_small_window = YES;
@@ -436,29 +486,33 @@ static VLCMain *_o_sharedMainInstance = nil;
 
     o_size_with_playlist = [o_window frame].size;
 
-    p_playlist = (playlist_t *) vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+    p_playlist = pl_Yield( p_intf );
 
-    if( p_playlist )
+    /* Check if we need to start playing */
+    if( p_intf->b_play )
     {
-        /* Check if we need to start playing */
-        if( p_intf->b_play )
-        {
-            playlist_LockControl( p_playlist, PLAYLIST_AUTOPLAY );
-        }
-        var_Create( p_playlist, "fullscreen", VLC_VAR_BOOL | VLC_VAR_DOINHERIT);
-        val.b_bool = VLC_FALSE;
+        playlist_Control( p_playlist, PLAYLIST_AUTOPLAY, VLC_FALSE );
+    }
+    var_Create( p_playlist, "fullscreen", VLC_VAR_BOOL | VLC_VAR_DOINHERIT);
+    val.b_bool = VLC_FALSE;
 
-        var_AddCallback( p_playlist, "fullscreen", FullscreenChanged, self);
+    var_AddCallback( p_playlist, "fullscreen", FullscreenChanged, self);
+    var_AddCallback( p_playlist, "intf-show", ShowController, self);
 
-        [o_embedded_window setFullscreen: var_GetBool( p_playlist,
-                                                            "fullscreen" )];
-        vlc_object_release( p_playlist );
-    }
-    
+    vlc_object_release( p_playlist );
     var_Create( p_intf, "interaction", VLC_VAR_ADDRESS );
     var_AddCallback( p_intf, "interaction", InteractCallback, self );
     p_intf->b_interaction = VLC_TRUE;
-    
+
+    /* update the playmode stuff */
+    p_intf->p_sys->b_playmode_update = VLC_TRUE;
+
+    [[NSNotificationCenter defaultCenter] addObserver: self
+                                             selector: @selector(refreshVoutDeviceMenu:)
+                                                 name: NSApplicationDidChangeScreenParametersNotification
+                                               object: nil];
     nib_main_loaded = TRUE;
 }
 
@@ -486,7 +540,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     /* main menu */
     [o_mi_about setTitle: [_NS("About VLC media player") \
         stringByAppendingString: @"..."]];
-/*    [o_mi_checkForUpdate setTitle: _NS("Check for Update...")];*/
+    [o_mi_checkForUpdate setTitle: _NS("Check for Update...")];
     [o_mi_prefs setTitle: _NS("Preferences...")];
     [o_mi_add_intf setTitle: _NS("Add Interface")];
     [o_mu_add_intf setTitle: _NS("Add Interface")];
@@ -555,6 +609,10 @@ static VLCMain *_o_sharedMainInstance = nil;
     [o_mi_snapshot setTitle: _NS("Snapshot")];
     [o_mi_videotrack setTitle: _NS("Video Track")];
     [o_mu_videotrack setTitle: _NS("Video Track")];
+    [o_mi_aspect_ratio setTitle: _NS("Aspect-ratio")];
+    [o_mu_aspect_ratio setTitle: _NS("Aspect-ratio")];
+    [o_mi_crop setTitle: _NS("Crop")];
+    [o_mu_crop setTitle: _NS("Crop")];
     [o_mi_screen setTitle: _NS("Video Device")];
     [o_mu_screen setTitle: _NS("Video Device")];
     [o_mi_subtitle setTitle: _NS("Subtitles Track")];
@@ -572,8 +630,9 @@ static VLCMain *_o_sharedMainInstance = nil;
     [o_mi_extended setTitle: _NS("Extended Controls")];
     [o_mi_bookmarks setTitle: _NS("Bookmarks")];
     [o_mi_playlist setTitle: _NS("Playlist")];
-    [o_mi_info setTitle: _NS("Info")];
+    [o_mi_info setTitle: _NS("Information")];
     [o_mi_messages setTitle: _NS("Messages")];
+    [o_mi_errorsAndWarnings setTitle: _NS("Errors and Warnings")];
 
     [o_mi_bring_atf setTitle: _NS("Bring All to Front")];
 
@@ -592,18 +651,19 @@ static VLCMain *_o_sharedMainInstance = nil;
     [o_dmi_next setTitle: _NS("Next")];
     [o_dmi_previous setTitle: _NS("Previous")];
     [o_dmi_mute setTitle: _NS("Mute")];
+    /* vout menu */
+    [o_vmi_play setTitle: _NS("Play")];
+    [o_vmi_stop setTitle: _NS("Stop")];
+    [o_vmi_prev setTitle: _NS("Previous")];
+    [o_vmi_next setTitle: _NS("Next")];
+    [o_vmi_volup setTitle: _NS("Volume Up")];
+    [o_vmi_voldown setTitle: _NS("Volume Down")];
+    [o_vmi_mute setTitle: _NS("Mute")];
+    [o_vmi_fullscreen setTitle: _NS("Fullscreen")];
+    [o_vmi_snapshot setTitle: _NS("Snapshot")];
 
-    /* error panel */
-    [o_error setTitle: _NS("Error")];
-    [o_err_lbl setStringValue: _NS("An error has occurred which probably " \
-        "prevented the execution of your request:")];
-    [o_err_bug_lbl setStringValue: _NS("If you believe that it is a bug, " \
-        "please follow the instructions at:")];
-    [o_err_btn_msgs setTitle: _NS("Open Messages Window")];
-    [o_err_btn_dismiss setTitle: _NS("Dismiss")];
-    [o_err_ckbk_surpress setTitle: _NS("Suppress further errors")];
-
-    [o_info_window setTitle: _NS("Info")];
+    [o_info_window setTitle: _NS("Information")];
 }
 
 - (void)applicationWillFinishLaunching:(NSNotification *)o_notification
@@ -636,9 +696,12 @@ static VLCMain *_o_sharedMainInstance = nil;
 
 - (BOOL)application:(NSApplication *)o_app openFile:(NSString *)o_filename
 {
+    BOOL b_autoplay = config_GetInt( VLCIntf, "macosx-autoplay" );
     NSDictionary *o_dic = [NSDictionary dictionaryWithObjectsAndKeys: o_filename, @"ITEM_URL", nil];
-    [o_playlist appendArray:
-        [NSArray arrayWithObject: o_dic] atPos: -1 enqueue: NO];
+    if( b_autoplay )
+        [o_playlist appendArray: [NSArray arrayWithObject: o_dic] atPos: -1 enqueue: NO];
+    else
+        [o_playlist appendArray: [NSArray arrayWithObject: o_dic] atPos: -1 enqueue: YES];
 
     return( TRUE );
 }
@@ -650,15 +713,147 @@ static VLCMain *_o_sharedMainInstance = nil;
     if( psz != NULL )
     {
         o_str = [[[NSString alloc] initWithUTF8String: psz] autorelease];
+
+        if ( o_str == NULL )
+        {
+            msg_Err( VLCIntf, "could not translate: %s", psz );
+            return( @"" );
+        }
     }
-    if ( o_str == NULL )
+    else
     {
-        msg_Err( VLCIntf, "could not translate: %s", psz );
+        msg_Warn( VLCIntf, "can't translate empty strings" );
+        return( @"" );
     }
 
     return( o_str );
 }
 
+/* When user click in the Dock icon our double click in the finder */
+- (BOOL)applicationShouldHandleReopen:(NSApplication *)theApplication hasVisibleWindows:(BOOL)hasVisibleWindows
+{    
+    if (!hasVisibleWindows)
+        [o_window makeKeyAndOrderFront:self];
+
+    return YES;
+}
+
+- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
+{
+    /* Check for update silently on startup */
+    if ( !nib_update_loaded )
+        nib_update_loaded = [NSBundle loadNibNamed:@"Update" owner:self];
+
+    if([o_update shouldCheckForUpdate])
+        [NSThread detachNewThreadSelector:@selector(checkForUpdate) toTarget:o_update withObject:NULL];
+    /* Handle sleep notification */
+    [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(computerWillSleep:)
+           name:NSWorkspaceWillSleepNotification object:nil];
+}
+
+/* Listen to the remote in exclusive mode, only when VLC is the active
+   application */
+- (void)applicationDidBecomeActive:(NSNotification *)aNotification
+{
+    [o_remote startListening: self];
+}
+- (void)applicationDidResignActive:(NSNotification *)aNotification
+{
+    [o_remote stopListening: self];
+}
+
+/* Triggered when the computer goes to sleep */
+- (void)computerWillSleep: (NSNotification *)notification
+{
+    /* Pause */
+    if ( p_intf->p_sys->i_play_status == PLAYING_S )
+    {
+        vlc_value_t val;
+        val.i_int = config_GetInt( p_intf, "key-play-pause" );
+        var_Set( p_intf->p_libvlc, "key-pressed", val );
+    }
+}
+
+/* Helper method for the remote control interface in order to trigger forward/backward and volume
+   increase/decrease as long as the user holds the left/right, plus/minus button */
+- (void) executeHoldActionForRemoteButton: (NSNumber*) buttonIdentifierNumber
+{
+    if (b_remote_button_hold)
+    {
+        switch([buttonIdentifierNumber intValue])
+        {
+            case kRemoteButtonRight_Hold:
+                  [o_controls forward: self];
+            break;
+            case kRemoteButtonLeft_Hold:
+                  [o_controls backward: self];
+            break;
+            case kRemoteButtonVolume_Plus_Hold:
+                [o_controls volumeUp: self];
+            break;
+            case kRemoteButtonVolume_Minus_Hold:
+                [o_controls volumeDown: self];
+            break;
+        }
+        if (b_remote_button_hold)
+        {
+            /* trigger event */
+            [self performSelector:@selector(executeHoldActionForRemoteButton:)
+                         withObject:buttonIdentifierNumber
+                         afterDelay:0.25];
+        }
+    }
+}
+
+/* Apple Remote callback */
+- (void) appleRemoteButton: (AppleRemoteEventIdentifier)buttonIdentifier
+               pressedDown: (BOOL) pressedDown
+                clickCount: (unsigned int) count
+{
+    switch( buttonIdentifier )
+    {
+        case kRemoteButtonPlay:
+            if (count >= 2) {
+                [o_controls toogleFullscreen:self];
+            } else {
+                [o_controls play: self];
+            }
+            break;
+        case kRemoteButtonVolume_Plus:
+            [o_controls volumeUp: self];
+            break;
+        case kRemoteButtonVolume_Minus:
+            [o_controls volumeDown: self];
+            break;
+        case kRemoteButtonRight:
+            [o_controls next: self];
+            break;
+        case kRemoteButtonLeft:
+            [o_controls prev: self];
+            break;
+        case kRemoteButtonRight_Hold:
+        case kRemoteButtonLeft_Hold:
+        case kRemoteButtonVolume_Plus_Hold:
+        case kRemoteButtonVolume_Minus_Hold:
+            /* simulate an event as long as the user holds the button */
+            b_remote_button_hold = pressedDown;
+            if( pressedDown )
+            {
+                NSNumber* buttonIdentifierNumber = [NSNumber numberWithInt: buttonIdentifier];
+                [self performSelector:@selector(executeHoldActionForRemoteButton:)
+                           withObject:buttonIdentifierNumber];
+            }
+            break;
+        case kRemoteButtonMenu:
+            [o_controls showPosition: self];
+            break;
+        default:
+            /* Add here whatever you want other buttons to do */
+            break;
+    }
+}
+
 - (char *)delocalizeString:(NSString *)id
 {
     NSData * o_data = [id dataUsingEncoding: NSUTF8StringEncoding
@@ -672,7 +867,7 @@ static VLCMain *_o_sharedMainInstance = nil;
         psz_string = malloc( [o_data length] + 1 );
         [o_data getBytes: psz_string];
         psz_string[ [o_data length] ] = '\0';
-        msg_Err( VLCIntf, "cannot convert to wanted encoding: %s",
+        msg_Err( VLCIntf, "cannot convert to the requested encoding: %s",
                  psz_string );
     }
     else
@@ -743,7 +938,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     int i;
 
     val.i_int = 0;
-    p_hotkeys = p_intf->p_vlc->p_hotkeys;
+    p_hotkeys = p_intf->p_libvlc->p_hotkeys;
 
     i_pressed_modifiers = [o_event modifierFlags];
 
@@ -779,7 +974,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     {
         if( p_hotkeys[i].i_key == val.i_int )
         {
-            var_Set( p_intf->p_vlc, "key-pressed", val );
+            var_Set( p_intf->p_libvlc, "key-pressed", val );
             return YES;
         }
     }
@@ -798,10 +993,8 @@ static VLCMain *_o_sharedMainInstance = nil;
 
 - (id)getPlaylist
 {
-    if ( o_playlist )
-    {
+    if( o_playlist )
         return o_playlist;
-    }
     return nil;
 }
 
@@ -850,6 +1043,34 @@ static VLCMain *_o_sharedMainInstance = nil;
     return nil;
 }
 
+- (id)getMainIntfPgbar
+{
+    if( o_main_pgbar )
+        return o_main_pgbar;
+
+    msg_Err( p_intf, "main interface progress bar item wasn't found" );
+    return nil;
+}
+
+- (id)getControllerWindow
+{
+    if( o_window )
+        return o_window;
+    return nil;
+}
+
+- (id)getVoutMenu
+{
+    return o_vout_menu;
+}
+
+- (id)getEyeTVController
+{
+    if( o_eyetv )
+        return o_eyetv;
+    return nil;
+}
+
 - (void)manage
 {
     playlist_t * p_playlist;
@@ -859,48 +1080,40 @@ static VLCMain *_o_sharedMainInstance = nil;
 
     vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
 
-    p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
-                                              FIND_ANYWHERE );
+    p_playlist = pl_Yield( p_intf );
 
-    if( p_playlist != NULL )
-    {
-        var_AddCallback( p_playlist, "intf-change", PlaylistChanged, self );
-        var_AddCallback( p_playlist, "item-change", PlaylistChanged, self );
-        var_AddCallback( p_playlist, "item-append", PlaylistChanged, self );
-        var_AddCallback( p_playlist, "item-deleted", PlaylistChanged, self );
-        var_AddCallback( p_playlist, "playlist-current", PlaylistChanged, self );
+    var_AddCallback( p_playlist, "intf-change", PlaylistChanged, self );
+    var_AddCallback( p_playlist, "item-change", PlaylistChanged, self );
+    var_AddCallback( p_playlist, "item-append", PlaylistChanged, self );
+    var_AddCallback( p_playlist, "item-deleted", PlaylistChanged, self );
+    var_AddCallback( p_playlist, "playlist-current", PlaylistChanged, self );
 
-        vlc_object_release( p_playlist );
-    }
+    vlc_object_release( p_playlist );
 
-    while( !p_intf->b_die )
+    while( !intf_ShouldDie( p_intf ) )
     {
         vlc_mutex_lock( &p_intf->change_lock );
 
-#define p_input p_intf->p_sys->p_input
 
-        if( p_input == NULL )
+        if( p_intf->p_sys->p_input == NULL )
         {
-            p_input = (input_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_INPUT,
-                                           FIND_ANYWHERE );
+            p_intf->p_sys->p_input = p_playlist->p_input;
 
-            /* Refresh the interface */
-            if( p_input )
+                /* Refresh the interface */
+            if( p_intf->p_sys->p_input )
             {
                 msg_Dbg( p_intf, "input has changed, refreshing interface" );
                 p_intf->p_sys->b_input_update = VLC_TRUE;
             }
         }
-        else if( p_input->b_die || p_input->b_dead )
+        else if( p_intf->p_sys->p_input->b_die || p_intf->p_sys->p_input->b_dead )
         {
             /* input stopped */
             p_intf->p_sys->b_intf_update = VLC_TRUE;
             p_intf->p_sys->i_play_status = END_S;
-            [self setScrollField: _NS("VLC media player") stopAfter:-1];
-            vlc_object_release( p_input );
-            p_input = NULL;
+            msg_Dbg( p_intf, "input has stopped, refreshing interface" );
+            p_intf->p_sys->p_input = NULL;
         }
-#undef p_input
 
         /* Manage volume status */
         [self manageVolumeSlider];
@@ -914,14 +1127,15 @@ static VLCMain *_o_sharedMainInstance = nil;
 - (void)manageIntf:(NSTimer *)o_timer
 {
     vlc_value_t val;
+    playlist_t * p_playlist;
+    input_thread_t * p_input;
 
-    if( p_intf->p_vlc->b_die == VLC_TRUE )
+    if( p_intf->p_libvlc->b_die == VLC_TRUE )
     {
         [o_timer invalidate];
         return;
     }
 
-#define p_input p_intf->p_sys->p_input
     if( p_intf->p_sys->b_input_update )
     {
         /* Called when new input is opened */
@@ -937,24 +1151,26 @@ static VLCMain *_o_sharedMainInstance = nil;
         vlc_bool_t b_seekable = VLC_FALSE;
         vlc_bool_t b_chapters = VLC_FALSE;
 
-        playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
-                                                   FIND_ANYWHERE );
-        b_plmul = p_playlist->i_size > 1;
-
-        vlc_object_release( p_playlist );
+        playlist_t * p_playlist = pl_Yield( p_intf );
+    /** \todo fix i_size use */
+        b_plmul = p_playlist->items.i_size > 1;
+        p_input = p_playlist->p_input;
 
         if( ( b_input = ( p_input != NULL ) ) )
         {
             /* seekable streams */
-            var_Get( p_input, "seekable", &val);
-            b_seekable = val.b_bool;
+            vlc_object_yield( p_input );
+            b_seekable = var_GetBool( p_input, "seekable" );
 
             /* check wether slow/fast motion is possible*/
-            b_control = p_input->input.b_can_pace_control;
+            b_control = p_input->b_can_pace_control;
 
             /* chapters & titles */
             //b_chapters = p_input->stream.i_area_nb > 1;
+            vlc_object_release( p_input );
         }
+        vlc_object_release( p_playlist );
 
         [o_btn_stop setEnabled: b_input];
         [o_btn_ff setEnabled: b_seekable];
@@ -965,6 +1181,8 @@ static VLCMain *_o_sharedMainInstance = nil;
         [o_timeslider setFloatValue: 0.0];
         [o_timeslider setEnabled: b_seekable];
         [o_timefield setStringValue: @"0:00:00"];
+        [[[self getControls] getFSPanel] setStreamPos: 0 andTime: @"0:00:00"];
+        [[[self getControls] getFSPanel] setSeekable: b_seekable];
 
         [o_embedded_window setSeekable: b_seekable];
 
@@ -984,61 +1202,49 @@ static VLCMain *_o_sharedMainInstance = nil;
 
     if( p_intf->p_sys->b_fullscreen_update )
     {
-        playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
-                                                   FIND_ANYWHERE );
-        var_Get( p_playlist, "fullscreen", &val );
-        [o_embedded_window setFullscreen: val.b_bool];
-        vlc_object_release( p_playlist );
-
         p_intf->p_sys->b_fullscreen_update = VLC_FALSE;
     }
 
+    if( p_intf->p_sys->b_intf_show )
+    {
+        [o_window makeKeyAndOrderFront: self];
+
+        p_intf->p_sys->b_intf_show = VLC_FALSE;
+    }
+
+    p_playlist = pl_Yield( p_intf );
+    p_input = p_playlist->p_input;
+
     if( p_input && !p_input->b_die )
     {
         vlc_value_t val;
+        vlc_object_yield( p_input );
 
         if( p_intf->p_sys->b_current_title_update )
         {
             NSString *o_temp;
-            vout_thread_t *p_vout;
-            playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
-                                                       FIND_ANYWHERE );
 
-            if( p_playlist == NULL || p_playlist->status.p_item == NULL )
+            if( p_playlist->status.p_item == NULL )
             {
+                vlc_object_release( p_input );
+                vlc_object_release( p_playlist );
                 return;
             }
             o_temp = [NSString stringWithUTF8String:
-                p_playlist->status.p_item->input.psz_name];
+                p_playlist->status.p_item->p_input->psz_name];
             if( o_temp == NULL )
                 o_temp = [NSString stringWithCString:
-                    p_playlist->status.p_item->input.psz_name];
+                    p_playlist->status.p_item->p_input->psz_name];
             [self setScrollField: o_temp stopAfter:-1];
+            [[[self getControls] getFSPanel] setStreamTitle: o_temp];
 
-            p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
-                                                    FIND_ANYWHERE );
-            if( p_vout != NULL )
-            {
-                id o_vout_wnd;
-                NSEnumerator * o_enum = [[NSApp orderedWindows] objectEnumerator];
-
-                while( ( o_vout_wnd = [o_enum nextObject] ) )
-                {
-                    if( [[o_vout_wnd className] isEqualToString: @"VLCWindow"]
-                        || [[[VLCMain sharedInstance] getEmbeddedList]
-                                            windowContainsEmbedded: o_vout_wnd])
-                    {
-                        [[o_vout_wnd getVoutView] updateTitle];
-                    }
-                }
-                vlc_object_release( (vlc_object_t *)p_vout );
-            }
+            [[o_controls getVoutView] updateTitle];
             [o_playlist updateRowSelection];
-            vlc_object_release( p_playlist );
             p_intf->p_sys->b_current_title_update = FALSE;
         }
 
-        if( p_input && [o_timeslider isEnabled] )
+        if( [o_timeslider isEnabled] )
         {
             /* Update the slider */
             vlc_value_t time;
@@ -1059,6 +1265,7 @@ static VLCMain *_o_sharedMainInstance = nil;
                             (int) (i_seconds / 60 % 60),
                             (int) (i_seconds % 60)];
             [o_timefield setStringValue: o_time];
+            [[[self getControls] getFSPanel] setStreamPos: f_updated andTime: o_time];
             [o_embedded_window setTime: o_time position: f_updated];
         }
 
@@ -1069,9 +1276,10 @@ static VLCMain *_o_sharedMainInstance = nil;
             o_text = [NSString stringWithFormat: _NS("Volume: %d%%"), i_lastShownVolume * 400 / AOUT_VOLUME_MAX];
             if( i_lastShownVolume != -1 )
             [self setScrollField:o_text stopAfter:1000000];
-            i_volume_step = config_GetInt( p_intf->p_vlc, "volume-step" );
+            i_volume_step = config_GetInt( p_intf->p_libvlc, "volume-step" );
             [o_volumeslider setFloatValue: (float)i_lastShownVolume / i_volume_step];
             [o_volumeslider setEnabled: TRUE];
+            [[[self getControls] getFSPanel] setVolumeLevel: (float)i_lastShownVolume / i_volume_step];
             p_intf->p_sys->b_mute = ( i_lastShownVolume == 0 );
             p_intf->p_sys->b_volume_update = FALSE;
         }
@@ -1084,6 +1292,7 @@ static VLCMain *_o_sharedMainInstance = nil;
             [self playStatusUpdated: p_intf->p_sys->i_play_status];
             [o_embedded_window playStatusUpdated: p_intf->p_sys->i_play_status];
         }
+        vlc_object_release( p_input );
     }
     else
     {
@@ -1093,15 +1302,13 @@ static VLCMain *_o_sharedMainInstance = nil;
         [o_embedded_window playStatusUpdated: p_intf->p_sys->i_play_status];
         [self setSubmenusEnabled: FALSE];
     }
-
-#undef p_input
+    vlc_object_release( p_playlist );
 
     [self updateMessageArray];
 
-    if( (i_end_scroll != -1) && (mdate() > i_end_scroll) )
+    if( ((i_end_scroll != -1) && (mdate() > i_end_scroll)) || !p_input )
         [self resetScrollField];
 
-
     [NSTimer scheduledTimerWithTimeInterval: 0.3
         target: self selector: @selector(manageIntf:)
         userInfo: nil repeats: FALSE];
@@ -1109,9 +1316,11 @@ static VLCMain *_o_sharedMainInstance = nil;
 
 - (void)setupMenus
 {
-#define p_input p_intf->p_sys->p_input
+    playlist_t * p_playlist = pl_Yield( p_intf );
+    input_thread_t * p_input = p_playlist->p_input;
     if( p_input != NULL )
     {
+        vlc_object_yield( p_input );
         [o_controls setupVarMenuItem: o_mi_program target: (vlc_object_t *)p_input
             var: "program" selector: @selector(toggleVar:)];
 
@@ -1152,6 +1361,12 @@ static VLCMain *_o_sharedMainInstance = nil;
         {
             vlc_object_t * p_dec_obj;
 
+            [o_controls setupVarMenuItem: o_mi_aspect_ratio target: (vlc_object_t *)p_vout
+                var: "aspect-ratio" selector: @selector(toggleVar:)];
+
+            [o_controls setupVarMenuItem: o_mi_crop target: (vlc_object_t *) p_vout
+                var: "crop" selector: @selector(toggleVar:)];
+
             [o_controls setupVarMenuItem: o_mi_screen target: (vlc_object_t *)p_vout
                 var: "video-device" selector: @selector(toggleVar:)];
 
@@ -1172,8 +1387,36 @@ static VLCMain *_o_sharedMainInstance = nil;
             }
             vlc_object_release( (vlc_object_t *)p_vout );
         }
+        vlc_object_release( p_input );
     }
-#undef p_input
+    vlc_object_release( p_playlist );
+}
+
+- (void)refreshVoutDeviceMenu:(NSNotification *)o_notification
+{
+    int x,y = 0;
+    vout_thread_t * p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
+                                              FIND_ANYWHERE );
+    if(! p_vout )
+        return;
+    /* clean the menu before adding new entries */
+    if( [o_mi_screen hasSubmenu] )
+    {
+        y = [[o_mi_screen submenu] numberOfItems] - 1;
+        msg_Dbg( VLCIntf, "%i items in submenu", y );
+        while( x != y )
+        {
+            msg_Dbg( VLCIntf, "removing item %i of %i", x, y );
+            [[o_mi_screen submenu] removeItemAtIndex: x];
+            x++;
+        }
+    }
+
+    [o_controls setupVarMenuItem: o_mi_screen target: (vlc_object_t *)p_vout
+                             var: "video-device" selector: @selector(toggleVar:)];
+    vlc_object_release( (vlc_object_t *)p_vout );
 }
 
 - (void)setScrollField:(NSString *)o_string stopAfter:(int)timeout
@@ -1187,34 +1430,31 @@ static VLCMain *_o_sharedMainInstance = nil;
 
 - (void)resetScrollField
 {
+    playlist_t * p_playlist = pl_Yield( p_intf );
+    input_thread_t * p_input = p_playlist->p_input;
+
     i_end_scroll = -1;
-#define p_input p_intf->p_sys->p_input
     if( p_input && !p_input->b_die )
     {
         NSString *o_temp;
-        playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
-                                                   FIND_ANYWHERE );
-        if( p_playlist == NULL )
-        {
-            return;
-        }
+        vlc_object_yield( p_input );
         o_temp = [NSString stringWithUTF8String:
-                  p_playlist->status.p_item->input.psz_name];
+                  p_playlist->status.p_item->p_input->psz_name];
         if( o_temp == NULL )
             o_temp = [NSString stringWithCString:
-                    p_playlist->status.p_item->input.psz_name];
+                    p_playlist->status.p_item->p_input->psz_name];
         [self setScrollField: o_temp stopAfter:-1];
+        vlc_object_release( p_input );
         vlc_object_release( p_playlist );
         return;
     }
-#undef p_input
+    vlc_object_release( p_playlist );
     [self setScrollField: _NS("VLC media player") stopAfter:-1];
 }
 
 - (void)updateMessageArray
 {
     int i_start, i_stop;
-    vlc_value_t quiet;
 
     vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock );
     i_stop = *p_intf->p_sys->p_sub->pi_stop;
@@ -1268,23 +1508,6 @@ static VLCMain *_o_sharedMainInstance = nil;
             [o_msg_arr addObject: [o_msg_color autorelease]];
 
             [o_msg_lock unlock];
-
-            var_Get( p_intf->p_vlc, "verbose", &quiet );
-
-            if( i_type == 1 && quiet.i_int > -1 )
-            {
-                NSString *o_my_msg = [NSString stringWithFormat: @"%s: %s\n",
-                    p_intf->p_sys->p_sub->p_msg[i_start].psz_module,
-                    p_intf->p_sys->p_sub->p_msg[i_start].psz_msg];
-
-                NSRange s_r = NSMakeRange( [[o_err_msg string] length], 0 );
-                [o_err_msg setEditable: YES];
-                [o_err_msg setSelectedRange: s_r];
-                [o_err_msg insertText: o_my_msg];
-
-                [o_error makeKeyAndOrderFront: self];
-                [o_err_msg setEditable: NO];
-            }
         }
 
         vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock );
@@ -1297,19 +1520,23 @@ static VLCMain *_o_sharedMainInstance = nil;
 {
     if( i_status == PLAYING_S )
     {
+        [[[self getControls] getFSPanel] setPause];
         [o_btn_play setImage: o_img_pause];
         [o_btn_play setAlternateImage: o_img_pause_pressed];
         [o_btn_play setToolTip: _NS("Pause")];
         [o_mi_play setTitle: _NS("Pause")];
         [o_dmi_play setTitle: _NS("Pause")];
+        [o_vmi_play setTitle: _NS("Pause")];
     }
     else
     {
+        [[[self getControls] getFSPanel] setPlay];
         [o_btn_play setImage: o_img_play];
         [o_btn_play setAlternateImage: o_img_play_pressed];
         [o_btn_play setToolTip: _NS("Play")];
         [o_mi_play setTitle: _NS("Play")];
         [o_dmi_play setTitle: _NS("Play")];
+        [o_vmi_play setTitle: _NS("Play")];
     }
 }
 
@@ -1327,6 +1554,8 @@ static VLCMain *_o_sharedMainInstance = nil;
     [o_mi_ffmpeg_pp setEnabled: b_enabled];
     [o_mi_device setEnabled: b_enabled];
     [o_mi_screen setEnabled: b_enabled];
+    [o_mi_aspect_ratio setEnabled: b_enabled];
+    [o_mi_crop setEnabled: b_enabled];
 }
 
 - (void)manageVolumeSlider
@@ -1343,8 +1572,9 @@ static VLCMain *_o_sharedMainInstance = nil;
 
 - (IBAction)timesliderUpdate:(id)sender
 {
-#define p_input p_intf->p_sys->p_input
     float f_updated;
+    playlist_t * p_playlist;
+    input_thread_t * p_input;
 
     switch( [[NSApp currentEvent] type] )
     {
@@ -1357,13 +1587,15 @@ static VLCMain *_o_sharedMainInstance = nil;
         default:
             return;
     }
-
+    p_playlist = pl_Yield( p_intf );
+    p_input = p_playlist->p_input;
     if( p_input != NULL )
     {
         vlc_value_t time;
         vlc_value_t pos;
         mtime_t i_seconds;
         NSString * o_time;
+        vlc_object_yield( p_input );
 
         pos.f_float = f_updated / 10000.;
         var_Set( p_input, "position", pos );
@@ -1377,80 +1609,75 @@ static VLCMain *_o_sharedMainInstance = nil;
                         (int) (i_seconds / 60 % 60),
                         (int) (i_seconds % 60)];
         [o_timefield setStringValue: o_time];
+        [[[self getControls] getFSPanel] setStreamPos: f_updated andTime: o_time];
         [o_embedded_window setTime: o_time position: f_updated];
+        vlc_object_release( p_input );
     }
-#undef p_input
+    vlc_object_release( p_playlist );
 }
 
-- (void)terminate
+- (void)applicationWillTerminate:(NSNotification *)notification
 {
     playlist_t * p_playlist;
     vout_thread_t * p_vout;
-
-#define p_input p_intf->p_sys->p_input
-    if( p_input )
-    {
-        vlc_object_release( p_input );
-        p_input = NULL;
-    }
-#undef p_input
-
+    int returnedValue = 0;
     /* Stop playback */
-    if( ( p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
-                                        FIND_ANYWHERE ) ) )
-    {
-        playlist_Stop( p_playlist );
-        vlc_object_release( p_playlist );
-    }
-
-    /* FIXME - Wait here until all vouts are terminated because
-       libvlc's VLC_CleanUp destroys interfaces before vouts, which isn't
-       good on OS X. We definitly need a cleaner way to handle this,
-       but this may hopefully be good enough for now.
-         -- titer 2003/11/22 */
-    while( ( p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
-                                       FIND_ANYWHERE ) ) )
-    {
-        vlc_object_release( p_vout );
-        msleep( 100000 );
-    }
-    msleep( 500000 );
+    p_playlist = pl_Yield( p_intf );
+    playlist_Stop( p_playlist );
+    vlc_object_release( p_playlist );
+
+    /* make sure that the current volume is saved */
+    config_PutInt( p_intf->p_libvlc, "volume", i_lastShownVolume );
+    returnedValue = config_SaveConfigFile( p_intf->p_libvlc, "main" );
+    if( returnedValue != 0 )
+        msg_Err( p_intf,
+                 "error while saving volume in osx's terminate method (%i)",
+                 returnedValue );
 
     /* save the prefs if they were changed in the extended panel */
     if (o_extended && [o_extended getConfigChanged])
     {
         [o_extended savePrefs];
     }
-    
     p_intf->b_interaction = VLC_FALSE;
     var_DelCallback( p_intf, "interaction", InteractCallback, self );
 
+    /* remove global observer watching for vout device changes correctly */
+    [[NSNotificationCenter defaultCenter] removeObserver: self
+                                                    name: NSApplicationDidChangeScreenParametersNotification
+                                                  object: nil];
+
     /* release some other objects here, because it isn't sure whether dealloc
      * will be called later on -- FK (10/6/05) */
     if( nib_about_loaded && o_about )
         [o_about release];
-    
     if( nib_open_loaded && o_open )
         [o_open release];
-    
     if( nib_extended_loaded && o_extended )
     {
         [o_extended collapsAll];
         [o_extended release];
     }
-    
     if( nib_bookmarks_loaded && o_bookmarks )
         [o_bookmarks release];
 
     if( nib_wizard_loaded && o_wizard )
         [o_wizard release];
-        
     if( o_embedded_list != nil )
         [o_embedded_list release];
 
     if( o_interaction_list != nil )
         [o_interaction_list release];
 
+    if( o_eyetv != nil )
+        [o_eyetv release];
+
     if( o_img_pause_pressed != nil )
     {
         [o_img_pause_pressed release];
@@ -1491,9 +1718,14 @@ static VLCMain *_o_sharedMainInstance = nil;
     /* write cached user defaults to disk */
     [[NSUserDefaults standardUserDefaults] synchronize];
 
-    p_intf->b_die = VLC_TRUE;
+    vlc_object_kill( p_intf );
+
+    /* Go back to Run() and make libvlc exit properly */
+    longjmp( jmpbuffer, 1 );
+    /* not reached */
 }
 
+
 - (IBAction)clearRecentItems:(id)sender
 {
     [[NSDocumentController sharedDocumentController]
@@ -1507,7 +1739,7 @@ static VLCMain *_o_sharedMainInstance = nil;
 
 - (IBAction)intfOpenFile:(id)sender
 {
-    if (!nib_open_loaded)
+    if ( !nib_open_loaded )
     {
         nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self];
         [o_open awakeFromNib];
@@ -1519,7 +1751,7 @@ static VLCMain *_o_sharedMainInstance = nil;
 
 - (IBAction)intfOpenFileGeneric:(id)sender
 {
-    if (!nib_open_loaded)
+    if ( !nib_open_loaded )
     {
         nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self];
         [o_open awakeFromNib];
@@ -1531,7 +1763,7 @@ static VLCMain *_o_sharedMainInstance = nil;
 
 - (IBAction)intfOpenDisc:(id)sender
 {
-    if (!nib_open_loaded)
+    if ( !nib_open_loaded )
     {
         nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self];
         [o_open awakeFromNib];
@@ -1543,7 +1775,7 @@ static VLCMain *_o_sharedMainInstance = nil;
 
 - (IBAction)intfOpenNet:(id)sender
 {
-    if (!nib_open_loaded)
+    if ( !nib_open_loaded )
     {
         nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self];
         [o_open awakeFromNib];
@@ -1555,7 +1787,7 @@ static VLCMain *_o_sharedMainInstance = nil;
 
 - (IBAction)showWizard:(id)sender
 {
-    if (!nib_wizard_loaded)
+    if ( !nib_wizard_loaded )
     {
         nib_wizard_loaded = [NSBundle loadNibNamed:@"Wizard" owner:self];
         [o_wizard initStrings];
@@ -1573,7 +1805,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     {
         o_extended = [[VLCExtended alloc] init];
     }
-    if (!nib_extended_loaded)
+    if ( !nib_extended_loaded )
     {
         nib_extended_loaded = [NSBundle loadNibNamed:@"Extended" owner:self];
         [o_extended initStrings];
@@ -1589,7 +1821,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     {
         o_sfilters = [[VLCsFilters alloc] init];
     }
-    if (!nib_sfilters_loaded)
+    if ( !nib_sfilters_loaded )
     {
         nib_sfilters_loaded = [NSBundle loadNibNamed:@"SFilters" owner:self];
         [o_sfilters initStrings];
@@ -1602,13 +1834,13 @@ static VLCMain *_o_sharedMainInstance = nil;
 - (IBAction)showBookmarks:(id)sender
 {
     /* we need the wizard-nib for the bookmarks's extract functionality */
-    if (!nib_wizard_loaded)
+    if ( !nib_wizard_loaded )
     {
         nib_wizard_loaded = [NSBundle loadNibNamed:@"Wizard" owner:self];
         [o_wizard initStrings];
     }
-    
-    if (!nib_bookmarks_loaded)
+    if ( !nib_bookmarks_loaded )
     {
         nib_bookmarks_loaded = [NSBundle loadNibNamed:@"Bookmarks" owner:self];
         [o_bookmarks showBookmarks];
@@ -1619,7 +1851,7 @@ static VLCMain *_o_sharedMainInstance = nil;
 
 - (IBAction)viewAbout:(id)sender
 {
-    if (!nib_about_loaded)
+    if ( !nib_about_loaded )
     {
         nib_about_loaded = [NSBundle loadNibNamed:@"About" owner:self];
         [o_about showPanel];
@@ -1636,28 +1868,12 @@ static VLCMain *_o_sharedMainInstance = nil;
     [o_prefs showPrefs];
 }
 
-/*- (IBAction)checkForUpdate:(id)sender
+- (IBAction)checkForUpdate:(id)sender
 {
-    if (!nib_update_loaded)
-    {
+    if ( !nib_update_loaded )
         nib_update_loaded = [NSBundle loadNibNamed:@"Update" owner:self];
-        [o_update showUpdateWindow];
-    } else {
-        [o_update showUpdateWindow];
-    }
-}*/
-
-- (IBAction)closeError:(id)sender
-{
-    vlc_value_t val;
 
-    if( [o_err_ckbk_surpress state] == NSOnState )
-    {
-        val.i_int = -1;
-        var_Set( p_intf->p_vlc, "verbose", val );
-    }
-    [o_err_msg setString: @""];
-    [o_error performClose: self];
+    [o_update showUpdateWindow];
 }
 
 - (IBAction)openReadMe:(id)sender
@@ -1728,11 +1944,21 @@ static VLCMain *_o_sharedMainInstance = nil;
     }
     else
     {
-        NSBeginInformationalAlertSheet(_NS("No CrashLog found"), @"Continue", nil, nil, o_msgs_panel, self, NULL, NULL, nil, _NS("You haven't experienced any heavy crashes yet.") );
+        NSBeginInformationalAlertSheet(_NS("No CrashLog found"), @"Continue", nil, nil, o_msgs_panel, self, NULL, NULL, nil, _NS("Couldn't find any trace of a previous crash.") );
 
     }
 }
 
+- (IBAction)viewErrorsAndWarnings:(id)sender
+{
+    [[[self getInteractionList] getErrorPanel] showPanel];
+}
+
+- (IBAction)showMessagesPanel:(id)sender
+{
+    [o_msgs_panel makeKeyAndOrderFront: sender];
+}
+
 - (void)windowDidBecomeKey:(NSNotification *)o_notification
 {
     if( [o_notification object] == o_msgs_panel )
@@ -1761,6 +1987,8 @@ static VLCMain *_o_sharedMainInstance = nil;
     /*First, check if the playlist is visible*/
     if( o_rect.size.height <= 200 )
     {
+        o_restore_rect = o_rect;
+        b_restore_size = true;
         b_small_window = YES; /* we know we are small, make sure this is actually set (see case below) */
         /* make large */
         if ( o_size_with_playlist.height > 200 )
@@ -1769,23 +1997,33 @@ static VLCMain *_o_sharedMainInstance = nil;
         } else {
             o_rect.size.height = 500;
         }
-        
         if ( o_size_with_playlist.width > [o_window minSize].width )
         {
             o_rect.size.width = o_size_with_playlist.width;
         } else {
             o_rect.size.width = 500;
         }
-        
         o_rect.size.height = (o_size_with_playlist.height > 200) ?
             o_size_with_playlist.height : 500;
         o_rect.origin.x = [o_window frame].origin.x;
         o_rect.origin.y = [o_window frame].origin.y - o_rect.size.height +
                                                 [o_window minSize].height;
+
+        NSRect screenRect = [[o_window screen] visibleFrame];
+        if ( !NSContainsRect( screenRect, o_rect ) ) {
+            if ( NSMaxX(o_rect) > NSMaxX(screenRect) )
+                o_rect.origin.x = ( NSMaxX(screenRect) - o_rect.size.width );
+            if ( NSMinY(o_rect) < NSMinY(screenRect) )
+                o_rect.origin.y = ( NSMinY(screenRect) );
+        }
+
         [o_btn_playlist setState: YES];
     }
     else
     {
+        NSSize curSize = o_rect.size;
         /* make small */
         o_rect.size.height = [o_window minSize].height;
         o_rect.size.width = [o_window minSize].width;
@@ -1794,6 +2032,9 @@ static VLCMain *_o_sharedMainInstance = nil;
         o_rect.origin.y = [o_window frame].origin.y +
             [o_window frame].size.height - [o_window minSize].height;
 
+        if ( b_restore_size )
+            o_rect = o_restore_rect;
+
         [o_playlist_view setAutoresizesSubviews: NO];
         [o_playlist_view removeFromSuperview];
         [o_btn_playlist setState: NO];
@@ -1837,6 +2078,11 @@ static VLCMain *_o_sharedMainInstance = nil;
     return proposedFrameSize;
 }
 
+- (void)windowDidMove:(NSNotification *)notif
+{
+    b_restore_size = false;
+}
+
 - (void)windowDidResize:(NSNotification *)notif
 {
     if( [o_window frame].size.height > 200 && b_small_window )