VLC_COMMON_MEMBERS
vlc_thread_t thread;
+ vlc_mutex_t lock;
vlc_cond_t wait;
int i_dialogs; ///< Number of dialogs
interaction_dialog_t **pp_dialogs; ///< Dialogs
intf_thread_t *p_intf; ///< Interface to use
- int i_last_id; ///< Last attributed ID
};
static interaction_t * InteractionGet( vlc_object_t * );
static void InteractionManage( interaction_t * );
static void DialogDestroy( interaction_dialog_t * );
-static int DialogSend( vlc_object_t *, interaction_dialog_t * );
+static int DialogSend( interaction_dialog_t * );
#define DIALOG_INIT( type, err ) \
interaction_dialog_t* p_new = calloc( 1, sizeof( interaction_dialog_t ) ); \
if( !p_new ) return err; \
p_new->p_parent = vlc_object_hold( p_this ); \
p_new->b_cancelled = false; \
- p_new->i_status = NEW_DIALOG; \
+ p_new->i_status = SENT_DIALOG; \
p_new->i_flags = 0; \
p_new->i_type = INTERACT_DIALOG_##type; \
p_new->psz_returned[0] = NULL; \
return VLC_EGENERIC; \
va_end( args )
-/**
- * Send an error message, both in a blocking and non-blocking way
- *
- * \param p_this Parent vlc_object
- * \param b_blocking Is this dialog blocking or not?
- * \param psz_title Title for the dialog
- * \param psz_format The message to display
- * \return VLC_SUCCESS or VLC_EGENERIC
- */
-int __intf_UserFatal( vlc_object_t *p_this, bool b_blocking,
- const char *psz_title,
- const char *psz_format, ... )
-{
- va_list args;
- DIALOG_INIT( ONEWAY, VLC_EGENERIC );
-
- p_new->psz_title = strdup( psz_title );
- FORMAT_DESC;
-
- if( b_blocking )
- p_new->i_flags = DIALOG_BLOCKING_ERROR;
- else
- p_new->i_flags = DIALOG_NONBLOCKING_ERROR;
-
- return DialogSend( p_this, p_new );
-}
-
-/**
- * Helper function to send a warning, which is always shown non-blocking
- *
- * \param p_this Parent vlc_object
- * \param psz_title Title for the dialog
- * \param psz_format The message to display
- * \return VLC_SUCCESS or VLC_EGENERIC
- */
-int __intf_UserWarn( vlc_object_t *p_this,
- const char *psz_title,
- const char *psz_format, ... )
+static inline int DialogFireForget( interaction_dialog_t *d )
{
- va_list args;
- DIALOG_INIT( ONEWAY, VLC_EGENERIC );
-
- p_new->psz_title = strdup( psz_title );
- FORMAT_DESC;
-
- p_new->i_flags = DIALOG_WARNING;
-
- return DialogSend( p_this, p_new );
+ int ret = DialogSend( d );
+ if( ret == VLC_EGENERIC )
+ DialogDestroy( d );
+ return ret;
}
/**
p_new->i_flags = DIALOG_YES_NO_CANCEL;
p_new->psz_default_button = strdup( psz_default );
p_new->psz_alternate_button = strdup( psz_alternate );
- if( psz_other )
- p_new->psz_other_button = strdup( psz_other );
+ p_new->psz_other_button = psz_other ? strdup( psz_other ) : NULL;
- return DialogSend( p_this, p_new );
+ return DialogFireForget( p_new );
}
/**
else
p_new->i_flags = DIALOG_INTF_PROGRESS;
- DialogSend( p_this, p_new );
+ if( DialogSend( p_new ) == VLC_EGENERIC )
+ {
+ DialogDestroy( p_new );
+ return NULL;
+ }
return p_new;
}
interaction_t *p_interaction = InteractionGet( p_dialog->p_parent );
assert( p_interaction );
- vlc_object_lock( p_interaction );
+ vlc_mutex_lock( &p_interaction->lock );
free( p_dialog->psz_description );
p_dialog->psz_description = strdup( psz_status );
p_dialog->i_status = UPDATED_DIALOG;
vlc_cond_signal( &p_interaction->wait );
- vlc_object_unlock( p_interaction );
+ vlc_mutex_unlock( &p_interaction->lock );
vlc_object_release( p_interaction );
}
bool b_cancel;
assert( p_interaction );
- vlc_object_lock( p_interaction );
+ vlc_mutex_lock( &p_interaction->lock );
b_cancel = p_dialog->b_cancelled;
- vlc_object_unlock( p_interaction );
+ vlc_mutex_unlock( &p_interaction->lock );
vlc_object_release( p_interaction );
return b_cancel;
}
p_new->i_flags = DIALOG_LOGIN_PW_OK_CANCEL;
- i_ret = DialogSend( p_this, p_new );
+ i_ret = DialogSend( p_new );
- if( i_ret != DIALOG_CANCELLED && i_ret != VLC_EGENERIC )
+ if( i_ret == VLC_EGENERIC )
+ DialogDestroy( p_new );
+ else if( i_ret != DIALOG_CANCELLED )
{
*ppsz_login = p_new->psz_returned[0]?
strdup( p_new->psz_returned[0] ) : NULL;
p_new->i_flags = DIALOG_PSZ_INPUT_OK_CANCEL;
- i_ret = DialogSend( p_this, p_new );
+ i_ret = DialogSend( p_new );
- if( i_ret != DIALOG_CANCELLED )
+ if( i_ret == VLC_EGENERIC )
+ DialogDestroy( p_new );
+ else if( i_ret != DIALOG_CANCELLED )
{
*ppsz_usersString = p_new->psz_returned[0]?
strdup( p_new->psz_returned[0] ) : NULL;
interaction_t *p_interaction = InteractionGet( p_dialog->p_parent );
assert( p_interaction );
- vlc_object_lock( p_interaction );
+ vlc_mutex_lock( &p_interaction->lock );
p_dialog->i_status = ANSWERED_DIALOG;
vlc_cond_signal( &p_interaction->wait );
- vlc_object_unlock( p_interaction );
+ vlc_mutex_unlock( &p_interaction->lock );
vlc_object_release( p_interaction );
}
p_interaction->i_dialogs = 0;
p_interaction->pp_dialogs = NULL;
p_interaction->p_intf = NULL;
- p_interaction->i_last_id = 0;
+ vlc_mutex_init( &p_interaction->lock );
vlc_cond_init( &p_interaction->wait );
if( vlc_clone( &p_interaction->thread, InteractionLoop, p_interaction,
vlc_cancel( p_interaction->thread );
vlc_join( p_interaction->thread, NULL );
vlc_cond_destroy( &p_interaction->wait );
+ vlc_mutex_destroy( &p_interaction->lock );
/* Remove all dialogs - Interfaces must be able to clean up their data */
for( int i = p_interaction->i_dialogs -1 ; i >= 0; i-- )
/* Ask for the dialog to be sent to the user. Wait for answer
* if required */
-static int DialogSend( vlc_object_t *p_this, interaction_dialog_t *p_dialog )
+static int DialogSend( interaction_dialog_t *p_dialog )
{
- interaction_t *p_interaction = InteractionGet( p_dialog->p_parent );
+ interaction_t *p_interaction;
+ intf_thread_t *p_intf;
+ if( ( p_dialog->p_parent->i_flags & OBJECT_FLAGS_NOINTERACT )
+ || !config_GetInt( p_interaction, "interact" ) )
+ return VLC_EGENERIC;
+
+ p_interaction = InteractionGet( p_dialog->p_parent );
if( !p_interaction )
return VLC_EGENERIC;
- if( p_this->i_flags & OBJECT_FLAGS_NOINTERACT )
+ p_dialog->p_lock = &p_interaction->lock;
+
+ p_intf = SearchInterface( p_interaction );
+ if( p_intf == NULL )
{
+ p_dialog->i_return = DIALOG_DEFAULT; /* Give default answer */
+
+ /* Pretend we have hidden and destroyed it */
+ p_dialog->i_status = HIDING_DIALOG;
vlc_object_release( p_interaction );
- return VLC_EGENERIC;
+ return VLC_SUCCESS;
}
+ p_dialog->p_interface = p_intf;
- if( config_GetInt( p_this, "interact" ) ||
- p_dialog->i_flags & DIALOG_BLOCKING_ERROR ||
- p_dialog->i_flags & DIALOG_NONBLOCKING_ERROR )
- {
- bool b_found = false;
- int i;
- p_dialog->p_interaction = p_interaction;
- p_dialog->p_parent = p_this;
-
- /* Check if we have already added this dialog */
- vlc_object_lock( p_interaction );
- for( i = 0 ; i< p_interaction->i_dialogs; i++ )
- {
- if( p_interaction->pp_dialogs[i] == p_dialog )
- b_found = true;
- }
- /* Add it to the queue, the main loop will send the orders to the
- * interface */
- if( ! b_found )
- {
- INSERT_ELEM( p_interaction->pp_dialogs,
- p_interaction->i_dialogs,
- p_interaction->i_dialogs,
- p_dialog );
- }
- else
- p_dialog->i_status = UPDATED_DIALOG;
+ p_dialog->i_action = INTERACT_NEW;
+ var_SetAddress( p_dialog->p_interface, "interaction", p_dialog );
- if( p_dialog->i_type == INTERACT_DIALOG_TWOWAY ) /* Wait for answer */
+ /* Check if we have already added this dialog */
+ vlc_mutex_lock( &p_interaction->lock );
+ /* Add it to the queue, the main loop will send the orders to the
+ * interface */
+ INSERT_ELEM( p_interaction->pp_dialogs, p_interaction->i_dialogs,
+ p_interaction->i_dialogs, p_dialog );
+
+ if( p_dialog->i_type == INTERACT_DIALOG_TWOWAY ) /* Wait for answer */
+ {
+ vlc_cond_signal( &p_interaction->wait );
+ while( p_dialog->i_status != ANSWERED_DIALOG &&
+ p_dialog->i_status != HIDING_DIALOG &&
+ p_dialog->i_status != HIDDEN_DIALOG &&
+ !p_dialog->p_parent->b_die )
{
- vlc_cond_signal( &p_interaction->wait );
- while( p_dialog->i_status != ANSWERED_DIALOG &&
- p_dialog->i_status != HIDING_DIALOG &&
- p_dialog->i_status != HIDDEN_DIALOG &&
- !p_dialog->p_parent->b_die )
- {
- vlc_object_unlock( p_interaction );
- msleep( 100000 );
- vlc_object_lock( p_interaction );
- }
- if( p_dialog->p_parent->b_die )
- {
- p_dialog->i_return = DIALOG_CANCELLED;
- p_dialog->i_status = ANSWERED_DIALOG;
- }
- p_dialog->i_flags |= DIALOG_GOT_ANSWER;
- vlc_cond_signal( &p_interaction->wait );
- vlc_object_unlock( p_interaction );
- vlc_object_release( p_interaction );
- return p_dialog->i_return;
+ vlc_mutex_unlock( &p_interaction->lock );
+ msleep( 100000 );
+ vlc_mutex_lock( &p_interaction->lock );
}
- else
+ if( p_dialog->p_parent->b_die )
{
- /* Pretend we already retrieved the "answer" */
- p_dialog->i_flags |= DIALOG_GOT_ANSWER;
- vlc_cond_signal( &p_interaction->wait );
- vlc_object_unlock( p_interaction );
- vlc_object_release( p_interaction );
- return VLC_SUCCESS;
+ p_dialog->i_return = DIALOG_CANCELLED;
+ p_dialog->i_status = ANSWERED_DIALOG;
}
}
+ p_dialog->i_flags |= DIALOG_GOT_ANSWER;
+ vlc_cond_signal( &p_interaction->wait );
+ vlc_mutex_unlock( &p_interaction->lock );
+ vlc_object_release( p_interaction );
+ if( p_dialog->i_type == INTERACT_DIALOG_TWOWAY )
+ return p_dialog->i_return;
else
- {
- vlc_object_release( p_interaction );
- return VLC_EGENERIC;
- }
+ return VLC_SUCCESS;
}
static void* InteractionLoop( void *p_this )
{
interaction_t *p_interaction = p_this;
- vlc_object_lock( p_interaction );
- mutex_cleanup_push( &(vlc_internals(p_interaction)->lock) );
+ vlc_mutex_lock( &p_interaction->lock );
+ mutex_cleanup_push( &p_interaction->lock );
for( ;; )
{
int canc = vlc_savecancel();
InteractionManage( p_interaction );
vlc_restorecancel( canc );
- vlc_cond_wait( &p_interaction->wait, &(vlc_internals(p_interaction)->lock) );
+ vlc_cond_wait( &p_interaction->wait, &p_interaction->lock );
}
vlc_cleanup_pop( );
assert( 0 );
vlc_value_t val;
int i_index;
- /* Nothing to do */
- if( p_interaction->i_dialogs == 0 ) return;
-
- p_interaction->p_intf = SearchInterface( p_interaction );
- if( !p_interaction->p_intf )
- {
- /* We mark all dialogs as answered with their "default" answer */
- for( i_index = 0 ; i_index < p_interaction->i_dialogs; i_index ++ )
- {
- interaction_dialog_t *p_dialog = p_interaction->pp_dialogs[i_index];
- p_dialog->i_return = DIALOG_DEFAULT; /* Give default answer */
-
- /* Pretend we have hidden and destroyed it */
- if( p_dialog->i_status == HIDDEN_DIALOG )
- p_dialog->i_status = DESTROYED_DIALOG;
- else
- p_dialog->i_status = HIDING_DIALOG;
- }
- }
-
for( i_index = 0 ; i_index < p_interaction->i_dialogs; i_index ++ )
{
interaction_dialog_t *p_dialog = p_interaction->pp_dialogs[i_index];
/* Ask interface to hide it */
p_dialog->i_action = INTERACT_HIDE;
val.p_address = p_dialog;
- if( p_interaction->p_intf )
- var_Set( p_interaction->p_intf, "interaction", val );
+ var_Set( p_dialog->p_interface, "interaction", val );
p_dialog->i_status = HIDING_DIALOG;
break;
case UPDATED_DIALOG:
p_dialog->i_action = INTERACT_UPDATE;
val.p_address = p_dialog;
- if( p_interaction->p_intf )
- var_Set( p_interaction->p_intf, "interaction", val );
+ var_Set( p_dialog->p_interface, "interaction", val );
p_dialog->i_status = SENT_DIALOG;
break;
case HIDDEN_DIALOG:
if( !(p_dialog->i_flags & DIALOG_GOT_ANSWER) ) break;
p_dialog->i_action = INTERACT_DESTROY;
val.p_address = p_dialog;
- if( p_interaction->p_intf )
- var_Set( p_interaction->p_intf, "interaction", val );
+ var_Set( p_dialog->p_interface, "interaction", val );
break;
case DESTROYED_DIALOG:
/* Interface has now destroyed it, remove it */
i_index--;
DialogDestroy( p_dialog );
break;
- case NEW_DIALOG:
- /* This is truly a new dialog, send it. */
-
- p_dialog->i_action = INTERACT_NEW;
- val.p_address = p_dialog;
- if( p_interaction->p_intf )
- var_Set( p_interaction->p_intf, "interaction", val );
- p_dialog->i_status = SENT_DIALOG;
- break;
}
}
-
- if( p_interaction->p_intf )
- vlc_object_release( p_interaction->p_intf );
}
projects / vlc / blobdiff