[vlc-devel] commit: macosx: cleanup (Jean-Paul Saman )

[git version control]

vlc | branch: master | Jean-Paul Saman <jpsaman at videolan.org> | Tue Mar 10 10:51:36 2009 +0100| [98c893ec7f44e8962a6bfd3e41cc8be6c41ec468] | committer: Jean-Paul Saman 

macosx: cleanup

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

 modules/gui/macosx/intf.m         |   26 +++++++++++++++-----------
 modules/gui/macosx/playlistinfo.m |   11 ++++++-----
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 8547121..318b94f 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -79,9 +79,7 @@ int OpenIntf ( vlc_object_t *p_this )
 
     p_intf->p_sys = malloc( sizeof( intf_sys_t ) );
     if( p_intf->p_sys == NULL )
-    {
-        return( 1 );
-    }
+        return VLC_ENOMEM;
 
     memset( p_intf->p_sys, 0, sizeof( *p_intf->p_sys ) );
 
@@ -92,7 +90,7 @@ int OpenIntf ( vlc_object_t *p_this )
     p_intf->pf_run = Run;
     p_intf->b_should_run_on_first_thread = true;
 
-    return( 0 );
+    return VLC_SUCCESS;
 }
 
 /*****************************************************************************
@@ -184,10 +182,13 @@ 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_intf_update = true;
-    p_intf->p_sys->b_playlist_update = true;
-    p_intf->p_sys->b_playmode_update = true;
-    p_intf->p_sys->b_current_title_update = true;
+    if( p_intf && p_intf->p_sys )
+    {
+        p_intf->p_sys->b_intf_update = true;
+        p_intf->p_sys->b_playlist_update = true;
+        p_intf->p_sys->b_playmode_update = true;
+        p_intf->p_sys->b_current_title_update = true;
+    }
     return VLC_SUCCESS;
 }
 
@@ -200,7 +201,8 @@ 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 = true;
+    if( p_intf && p_intf->p_sys )
+        p_intf->p_sys->b_intf_show = true;
     return VLC_SUCCESS;
 }
 
@@ -212,7 +214,8 @@ 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;
+    if( p_intf && p_intf->p_sys )
+        p_intf->p_sys->b_fullscreen_update = true;
     return VLC_SUCCESS;
 }
 
@@ -1538,7 +1541,8 @@ static void * manage_cleanup( void * args )
         bool b_chapters = false;
 
         playlist_t * p_playlist = pl_Hold( p_intf );
-    /* TODO: fix i_size use */
+
+        /* TODO: fix i_size use */
         b_plmul = p_playlist->items.i_size > 1;
 
         p_input = playlist_CurrentInput( p_playlist );
diff --git a/modules/gui/macosx/playlistinfo.m b/modules/gui/macosx/playlistinfo.m
index d924cfc..b5615e0 100644
--- a/modules/gui/macosx/playlistinfo.m
+++ b/modules/gui/macosx/playlistinfo.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  r playlistinfo.m: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2008 the VideoLAN team
+ * Copyright (C) 2002-2009 the VideoLAN team
  * $Id$
  *
  * Authors: Benjamin Pracht <bigben at videolan dot org>
@@ -45,9 +45,12 @@ static VLCInfo *_o_sharedInstance = nil;
 
 - (id)init
 {
-    if( _o_sharedInstance ) {
+    if( _o_sharedInstance )
+    {
         [self dealloc];
-    } else {
+    }
+    else
+    {
         _o_sharedInstance = [super init];
         
         if( _o_sharedInstance != nil )
@@ -302,7 +305,6 @@ static VLCInfo *_o_sharedInstance = nil;
 
     /* update the stats once to display p_item change faster */
     [self updateStatistics: nil];
-
 }
 
 - (void)setMeta: (char *)psz_meta forLabel: (id)theItem
@@ -484,7 +486,6 @@ error:
     }
 }
 
-
 @end
 
 @implementation VLCInfoTreeItem