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 intf_thread_t * SearchInterface( interaction_t * );
static void* InteractionLoop( void * );
static void InteractionManage( interaction_t * );
static void DialogDestroy( interaction_dialog_t * );
-static int DialogSend( vlc_object_t *, 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; \
p_new->psz_returned[1] = NULL
-#define FORMAT_DESC \
- va_start( args, psz_format ); \
- if( vasprintf( &p_new->psz_description, psz_format, args ) == -1 ) \
- 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, ... )
-{
- 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 );
-}
-
-/**
- * Helper function to ask a yes-no-cancel question
- *
- * \param p_this Parent vlc_object
- * \param psz_title Title for the dialog
- * \param psz_description A description
- * \param psz_default caption for the default button
- * \param psz_alternate caption for the alternate button
- * \param psz_other caption for the optional 3rd button (== cancel)
- * \return Clicked button code
- */
-int __intf_UserYesNo( vlc_object_t *p_this,
- const char *psz_title,
- const char *psz_description,
- const char *psz_default,
- const char *psz_alternate,
- const char *psz_other )
-{
- DIALOG_INIT( TWOWAY, VLC_EGENERIC );
-
- p_new->psz_title = strdup( psz_title );
- p_new->psz_description = strdup( psz_description );
- 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 );
-
- return DialogSend( p_this, p_new );
-}
-
-/**
- * Helper function to create a dialogue showing a progress-bar with some info
- *
- * \param p_this Parent vlc_object
- * \param psz_title Title for the dialog (NULL implies main intf )
- * \param psz_status Current status
- * \param f_position Current position (0.0->100.0)
- * \param i_timeToGo Time (in sec) to go until process is finished
- * \return Dialog, for use with UserProgressUpdate
- */
-interaction_dialog_t *
-__intf_Progress( vlc_object_t *p_this, const char *psz_title,
- const char *psz_status, float f_pos, int i_time )
-{
- DIALOG_INIT( ONEWAY, NULL );
- p_new->psz_description = strdup( psz_status );
- p_new->val.f_float = f_pos;
- p_new->i_timeToGo = i_time;
- p_new->psz_alternate_button = strdup( _( "Cancel" ) );
-
- if( psz_title )
- {
- p_new->psz_title = strdup( psz_title );
- p_new->i_flags = DIALOG_USER_PROGRESS;
- }
- else
- p_new->i_flags = DIALOG_INTF_PROGRESS;
-
- DialogSend( p_this, p_new );
- return p_new;
-}
-
-/**
- * Update a progress bar in a dialogue
- *
- * \param p_dialog Dialog
- * \param psz_status New status
- * \param f_position New position (0.0->100.0)
- * \param i_timeToGo Time (in sec) to go until process is finished
- * \return nothing
- */
-void intf_ProgressUpdate( interaction_dialog_t *p_dialog,
- const char *psz_status, float f_pos, int i_time )
-{
- interaction_t *p_interaction = InteractionGet( p_dialog->p_parent );
- assert( p_interaction );
-
- vlc_object_lock( p_interaction );
- free( p_dialog->psz_description );
- p_dialog->psz_description = strdup( psz_status );
-
- p_dialog->val.f_float = f_pos;
- p_dialog->i_timeToGo = i_time;
-
- p_dialog->i_status = UPDATED_DIALOG;
-
- vlc_cond_signal( &p_interaction->wait );
- vlc_object_unlock( p_interaction );
- vlc_object_release( p_interaction );
-}
-
-/**
- * Helper function to communicate dialogue cancellations between the
- * interface module and the caller
- *
- * \param p_dialog Dialog
- * \return Either true or false
- */
-bool intf_ProgressIsCancelled( interaction_dialog_t *p_dialog )
-{
- interaction_t *p_interaction = InteractionGet( p_dialog->p_parent );
- bool b_cancel;
-
- assert( p_interaction );
- vlc_object_lock( p_interaction );
- b_cancel = p_dialog->b_cancelled;
- vlc_object_unlock( p_interaction );
- vlc_object_release( p_interaction );
- return b_cancel;
-}
-
-/**
- * Helper function to make a login/password dialogue
- *
- * \param p_this Parent vlc_object
- * \param psz_title Title for the dialog
- * \param psz_description A description
- * \param ppsz_login Returned login
- * \param ppsz_password Returned password
- * \return Clicked button code
- */
-int __intf_UserLoginPassword( vlc_object_t *p_this,
- const char *psz_title,
- const char *psz_description,
- char **ppsz_login,
- char **ppsz_password )
-{
- int i_ret;
- DIALOG_INIT( TWOWAY, VLC_EGENERIC );
- p_new->i_type = INTERACT_DIALOG_TWOWAY;
- p_new->psz_title = strdup( psz_title );
- p_new->psz_description = strdup( psz_description );
- p_new->psz_default_button = strdup( _("OK" ) );
- p_new->psz_alternate_button = strdup( _("Cancel" ) );
-
- p_new->i_flags = DIALOG_LOGIN_PW_OK_CANCEL;
-
- i_ret = DialogSend( p_this, p_new );
-
- if( i_ret != DIALOG_CANCELLED && i_ret != VLC_EGENERIC )
- {
- *ppsz_login = p_new->psz_returned[0]?
- strdup( p_new->psz_returned[0] ) : NULL;
- *ppsz_password = p_new->psz_returned[1]?
- strdup( p_new->psz_returned[1] ) : NULL;
- }
- return i_ret;
-}
-
-/**
- * Helper function to make a dialogue asking the user for !password string
- *
- * \param p_this Parent vlc_object
- * \param psz_title Title for the dialog
- * \param psz_description A description
- * \param ppsz_usersString Returned login
- * \return Clicked button code
- */
-int __intf_UserStringInput( vlc_object_t *p_this,
- const char *psz_title,
- const char *psz_description,
- char **ppsz_usersString )
-{
- int i_ret;
- DIALOG_INIT( TWOWAY, VLC_EGENERIC );
- p_new->i_type = INTERACT_DIALOG_TWOWAY;
- p_new->psz_title = strdup( psz_title );
- p_new->psz_description = strdup( psz_description );
-
- p_new->i_flags = DIALOG_PSZ_INPUT_OK_CANCEL;
-
- i_ret = DialogSend( p_this, p_new );
-
- if( i_ret != DIALOG_CANCELLED )
- {
- *ppsz_usersString = p_new->psz_returned[0]?
- strdup( p_new->psz_returned[0] ) : NULL;
- }
- return i_ret;
-}
-
-/**
- * Hide an interaction dialog
- *
- * \param p_dialog the dialog to hide
- * \return nothing
- */
-void intf_UserHide( interaction_dialog_t *p_dialog )
-{
- interaction_t *p_interaction = InteractionGet( p_dialog->p_parent );
- assert( p_interaction );
-
- vlc_object_lock( p_interaction );
- p_dialog->i_status = ANSWERED_DIALOG;
- vlc_cond_signal( &p_interaction->wait );
- vlc_object_unlock( p_interaction );
- vlc_object_release( p_interaction );
-}
-
/**
* Create the initial interaction object
* (should only be used in libvlc_InternalInit, LibVLC private)
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-- )
* The following functions are local
**********************************************************************/
-/* Get the interaction object */
-static interaction_t * InteractionGet( vlc_object_t *p_this )
-{
- interaction_t *obj = libvlc_priv(p_this->p_libvlc)->p_interaction;
- if( obj )
- vlc_object_hold( obj );
- return obj;
-}
-
-
-/* Look for an interface suitable for interaction, and hold it. */
-static intf_thread_t *SearchInterface( interaction_t *p_interaction )
-{
- libvlc_priv_t *priv = libvlc_priv( p_interaction->p_libvlc );
- intf_thread_t *intf;
-
- vlc_mutex_lock( &intf_lock );
- intf = priv->p_interaction_intf;
- if( intf != NULL )
- vlc_object_hold( intf );
- vlc_mutex_unlock( &intf_lock );
-
- return intf;
-}
-
/* Destroy a dialog */
static void DialogDestroy( interaction_dialog_t *p_dialog )
{
free( p_dialog->psz_title );
free( p_dialog->psz_description );
- free( p_dialog->psz_default_button );
free( p_dialog->psz_alternate_button );
- free( p_dialog->psz_other_button );
+ vlc_object_release( p_dialog->p_parent );
free( p_dialog );
}
-/* 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 )
-{
- interaction_t *p_interaction = InteractionGet( p_dialog->p_parent );
-
- if( !p_interaction )
- return VLC_EGENERIC;
-
- if( p_this->i_flags & OBJECT_FLAGS_NOINTERACT )
- {
- vlc_object_release( p_interaction );
- return VLC_EGENERIC;
- }
-
- 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;
-
- 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_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;
- }
- else
- {
- /* 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;
- }
- }
- else
- {
- vlc_object_release( p_interaction );
- return VLC_EGENERIC;
- }
-}
-
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