* macosx/*: minor clean-up
BOOL nib_interact_errpanel_loaded;
}
- (IBAction)cleanupTable:(id)sender;
BOOL nib_interact_errpanel_loaded;
}
- (IBAction)cleanupTable:(id)sender;
+- (IBAction)showMessages:(id)sender;
-(void)showPanel;
-(void)addError: (NSString *)o_error withMsg:(NSString *)o_msg;
-(void)showPanel;
-(void)addError: (NSString *)o_error withMsg:(NSString *)o_msg;
- (void)updateMessageArray
{
int i_start, i_stop;
- (void)updateMessageArray
{
int i_start, i_stop;
vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock );
i_stop = *p_intf->p_sys->p_sub->pi_stop;
vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock );
i_stop = *p_intf->p_sys->p_sub->pi_stop;
[o_msg_arr addObject: [o_msg_color autorelease]];
[o_msg_lock unlock];
[o_msg_arr addObject: [o_msg_color autorelease]];
[o_msg_lock unlock];
-
- var_Get( p_intf->p_vlc, "verbose", &quiet );
}
vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock );
}
vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock );
if( p_this->i_flags & OBJECT_FLAGS_NOINTERACT ) return VLC_EGENERIC;
if( p_this->i_flags & OBJECT_FLAGS_NOINTERACT ) return VLC_EGENERIC;
- if( !config_GetInt(p_this, "interact") ) return VLC_EGENERIC;
-
- p_dialog->p_interaction = p_interaction;
- p_dialog->p_parent = p_this;
-
- if( p_dialog->i_type == INTERACT_DIALOG_TWOWAY )
+ if( config_GetInt(p_this, "interact") ||
+ p_dialog->i_flags & DIALOG_BLOCKING_ERROR ||
+ p_dialog->i_flags & DIALOG_NONBLOCKING_ERROR )
- return intf_WaitAnswer( p_interaction, p_dialog );
+ p_dialog->p_interaction = p_interaction;
+ p_dialog->p_parent = p_this;
+
+ if( p_dialog->i_type == INTERACT_DIALOG_TWOWAY )
+ {
+ return intf_WaitAnswer( p_interaction, p_dialog );
+ }
+ else
+ {
+ p_dialog->i_flags |= DIALOG_GOT_ANSWER;
+ return intf_Send( p_interaction, p_dialog );
+ }
- {
- p_dialog->i_flags |= DIALOG_GOT_ANSWER;
- return intf_Send( p_interaction, p_dialog );
- }
INTERACT_INIT( p_new );
p_new->psz_title = strdup( psz_title );
INTERACT_INIT( p_new );
p_new->psz_title = strdup( psz_title );
+ p_new->i_type = INTERACT_DIALOG_ONEWAY;
va_start( args, psz_format );
vasprintf( &p_new->psz_description, psz_format, args );
va_start( args, psz_format );
vasprintf( &p_new->psz_description, psz_format, args );
INTERACT_INIT( p_new );
p_new->psz_title = strdup( psz_title );
INTERACT_INIT( p_new );
p_new->psz_title = strdup( psz_title );
+ p_new->i_type = INTERACT_DIALOG_ONEWAY;
va_start( args, psz_format );
vasprintf( &p_new->psz_description, psz_format, args );
va_start( args, psz_format );
vasprintf( &p_new->psz_description, psz_format, args );