Commit 98c893ec authored by Jean-Paul Saman's avatar Jean-Paul Saman

macosx: cleanup

parent a43467c2
...@@ -79,9 +79,7 @@ int OpenIntf ( vlc_object_t *p_this ) ...@@ -79,9 +79,7 @@ int OpenIntf ( vlc_object_t *p_this )
p_intf->p_sys = malloc( sizeof( intf_sys_t ) ); p_intf->p_sys = malloc( sizeof( intf_sys_t ) );
if( p_intf->p_sys == NULL ) if( p_intf->p_sys == NULL )
{ return VLC_ENOMEM;
return( 1 );
}
memset( p_intf->p_sys, 0, sizeof( *p_intf->p_sys ) ); memset( p_intf->p_sys, 0, sizeof( *p_intf->p_sys ) );
...@@ -92,7 +90,7 @@ int OpenIntf ( vlc_object_t *p_this ) ...@@ -92,7 +90,7 @@ int OpenIntf ( vlc_object_t *p_this )
p_intf->pf_run = Run; p_intf->pf_run = Run;
p_intf->b_should_run_on_first_thread = true; 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, ...@@ -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 ) vlc_value_t old_val, vlc_value_t new_val, void *param )
{ {
intf_thread_t * p_intf = VLCIntf; intf_thread_t * p_intf = VLCIntf;
p_intf->p_sys->b_intf_update = true; if( p_intf && p_intf->p_sys )
p_intf->p_sys->b_playlist_update = true; {
p_intf->p_sys->b_playmode_update = true; p_intf->p_sys->b_intf_update = true;
p_intf->p_sys->b_current_title_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; return VLC_SUCCESS;
} }
...@@ -200,7 +201,8 @@ static int ShowController( vlc_object_t *p_this, const char *psz_variable, ...@@ -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 ) vlc_value_t old_val, vlc_value_t new_val, void *param )
{ {
intf_thread_t * p_intf = VLCIntf; 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; return VLC_SUCCESS;
} }
...@@ -212,7 +214,8 @@ static int FullscreenChanged( vlc_object_t *p_this, const char *psz_variable, ...@@ -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 ) vlc_value_t old_val, vlc_value_t new_val, void *param )
{ {
intf_thread_t * p_intf = VLCIntf; 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; return VLC_SUCCESS;
} }
...@@ -1538,7 +1541,8 @@ static void * manage_cleanup( void * args ) ...@@ -1538,7 +1541,8 @@ static void * manage_cleanup( void * args )
bool b_chapters = false; bool b_chapters = false;
playlist_t * p_playlist = pl_Hold( p_intf ); 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; b_plmul = p_playlist->items.i_size > 1;
p_input = playlist_CurrentInput( p_playlist ); p_input = playlist_CurrentInput( p_playlist );
......
/***************************************************************************** /*****************************************************************************
r playlistinfo.m: MacOS X interface module r playlistinfo.m: MacOS X interface module
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2008 the VideoLAN team * Copyright (C) 2002-2009 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Benjamin Pracht <bigben at videolan dot org> * Authors: Benjamin Pracht <bigben at videolan dot org>
...@@ -45,9 +45,12 @@ static VLCInfo *_o_sharedInstance = nil; ...@@ -45,9 +45,12 @@ static VLCInfo *_o_sharedInstance = nil;
- (id)init - (id)init
{ {
if( _o_sharedInstance ) { if( _o_sharedInstance )
{
[self dealloc]; [self dealloc];
} else { }
else
{
_o_sharedInstance = [super init]; _o_sharedInstance = [super init];
if( _o_sharedInstance != nil ) if( _o_sharedInstance != nil )
...@@ -302,7 +305,6 @@ static VLCInfo *_o_sharedInstance = nil; ...@@ -302,7 +305,6 @@ static VLCInfo *_o_sharedInstance = nil;
/* update the stats once to display p_item change faster */ /* update the stats once to display p_item change faster */
[self updateStatistics: nil]; [self updateStatistics: nil];
} }
- (void)setMeta: (char *)psz_meta forLabel: (id)theItem - (void)setMeta: (char *)psz_meta forLabel: (id)theItem
...@@ -484,7 +486,6 @@ error: ...@@ -484,7 +486,6 @@ error:
} }
} }
@end @end
@implementation VLCInfoTreeItem @implementation VLCInfoTreeItem
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment