X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finterface%2Finteraction.c;h=93381dd7d1ce7cd8bb82c86fd8ece991e80de822;hb=6b8d2191f4d3885d654e06d2f72818b5083b2f4c;hp=a6b624c06a7755d4b869e5bd325612e9cdeb7296;hpb=093de8561e556dcc9c233fa4aef3046fb658721c;p=vlc diff --git a/src/interface/interaction.c b/src/interface/interaction.c index a6b624c06a..93381dd7d1 100644 --- a/src/interface/interaction.c +++ b/src/interface/interaction.c @@ -1,7 +1,7 @@ /***************************************************************************** * interaction.c: User interaction functions ***************************************************************************** - * Copyright (C) 2005-2006 VideoLAN + * Copyright © 2005-2008 the VideoLAN team * $Id$ * * Authors: Clément Stenac @@ -30,173 +30,81 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* free(), strtol() */ -#include /* FILE */ -#include /* strerror() */ -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include -#include "vlc_interaction.h" -#include "vlc_interface.h" -#include "vlc_playlist.h" +#include +#include "interface.h" +#include "libvlc.h" + +#include /***************************************************************************** * Local prototypes *****************************************************************************/ -static void InteractionInit( playlist_t *p_playlist ); -static interaction_t * InteractionGet( vlc_object_t *p_this ); -static void InteractionSearchInterface( interaction_t * - p_interaction ); -static interaction_dialog_t *DialogGetById( interaction_t* , int ); -static void DialogDestroy( interaction_dialog_t *p_dialog ); -static int DialogSend( vlc_object_t *p_this, interaction_dialog_t *p_dialog ); /** - * Destroy the interaction system - * \param The interaction object to destroy - * \return nothing + * This structure contains the active interaction dialogs, and is + * used by the manager */ -void intf_InteractionDestroy( interaction_t *p_interaction ) +struct interaction_t { - int i; - // Remove all dialogs - Interfaces must be able to clean up their data - for( i = p_interaction->i_dialogs -1 ; i >= 0; i-- ) - { - interaction_dialog_t * p_dialog = p_interaction->pp_dialogs[i]; - DialogDestroy( p_dialog ); - REMOVE_ELEM( p_interaction->pp_dialogs, p_interaction->i_dialogs, i ); - } - vlc_object_destroy( p_interaction ); -} + VLC_COMMON_MEMBERS + + vlc_thread_t thread; + 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_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 ) /** - * The main interaction processing loop - * This function is called from the playlist loop + * Send an error message, both in a blocking and non-blocking way * - * \param p_playlist the parent playlist - * \return nothing + * \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 */ -void intf_InteractionManage( playlist_t *p_playlist ) -{ - vlc_value_t val; - int i_index; - interaction_t *p_interaction = p_playlist->p_interaction; - - // Nothing to do - if( p_interaction->i_dialogs == 0 ) return; - - vlc_mutex_lock( &p_interaction->object_lock ); - - InteractionSearchInterface( 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; - } - } - } - else - { - vlc_object_yield( p_interaction->p_intf ); - } - - for( i_index = 0 ; i_index < p_interaction->i_dialogs; i_index ++ ) - { - interaction_dialog_t *p_dialog = p_interaction->pp_dialogs[i_index]; - switch( p_dialog->i_status ) - { - case ANSWERED_DIALOG: - // 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 ); - 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 ); - p_dialog->i_status = SENT_DIALOG; - break; - case HIDDEN_DIALOG: - if( !(p_dialog->i_flags & DIALOG_GOT_ANSWER) ) break; - if( !(p_dialog->i_flags & DIALOG_REUSABLE) ) - { - p_dialog->i_action = INTERACT_DESTROY; - val.p_address = p_dialog; - if( p_interaction->p_intf ) - var_Set( p_interaction->p_intf, "interaction", val ); - } - break; - case DESTROYED_DIALOG: - // Interface has now destroyed it, remove it - REMOVE_ELEM( p_interaction->pp_dialogs, p_interaction->i_dialogs, - i_index); - 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 ); - } - - vlc_mutex_unlock( &p_playlist->p_interaction->object_lock ); -} - -#define DIALOG_INIT( type ) \ - DECMALLOC_ERR( p_new, interaction_dialog_t ); \ - memset( p_new, 0, sizeof( interaction_dialog_t ) ); \ - p_new->b_cancelled = VLC_FALSE; \ - p_new->i_status = NEW_DIALOG; \ - 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 ); \ - vasprintf( &p_new->psz_description, psz_format, args ); \ - 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 - * */ -int __intf_UserFatal( vlc_object_t *p_this, vlc_bool_t b_blocking, +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 ); - + DIALOG_INIT( ONEWAY, VLC_EGENERIC ); + p_new->psz_title = strdup( psz_title ); FORMAT_DESC; @@ -208,34 +116,39 @@ int __intf_UserFatal( vlc_object_t *p_this, vlc_bool_t b_blocking, return DialogSend( p_this, p_new ); } -/** Helper function to send an 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 - * */ +/** + * 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 ); - + DIALOG_INIT( ONEWAY, VLC_EGENERIC ); + p_new->psz_title = strdup( psz_title ); - FORMAT_DESC + 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 +/** + * 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, @@ -244,7 +157,7 @@ int __intf_UserYesNo( vlc_object_t *p_this, const char *psz_alternate, const char *psz_other ) { - DIALOG_INIT( TWOWAY ); + DIALOG_INIT( TWOWAY, VLC_EGENERIC ); p_new->psz_title = strdup( psz_title ); p_new->psz_description = strdup( psz_description ); @@ -257,21 +170,25 @@ int __intf_UserYesNo( vlc_object_t *p_this, 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 id, to give to UserProgressUpdate +/** + * 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 */ -int __intf_Progress( vlc_object_t *p_this, const char *psz_title, +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 ); + 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 ) { @@ -282,118 +199,113 @@ int __intf_Progress( vlc_object_t *p_this, const char *psz_title, p_new->i_flags = DIALOG_INTF_PROGRESS; DialogSend( p_this, p_new ); - return p_new->i_id; + return p_new; } -/** Update a progress bar in a dialogue - * \param p_this Parent vlc_object - * \param i_id Identifier of the 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 +/** + * 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( vlc_object_t *p_this, int i_id, +void intf_ProgressUpdate( interaction_dialog_t *p_dialog, const char *psz_status, float f_pos, int i_time ) { - interaction_t *p_interaction = InteractionGet( p_this ); - interaction_dialog_t *p_dialog; - - if( !p_interaction ) return; - - vlc_mutex_lock( &p_interaction->object_lock ); - p_dialog = DialogGetById( p_interaction, i_id ); - - if( !p_dialog ) - { - vlc_mutex_unlock( &p_interaction->object_lock ) ; - return; - } + interaction_t *p_interaction = InteractionGet( p_dialog->p_parent ); + assert( p_interaction ); - FREE( p_dialog->psz_description ); + 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_mutex_unlock( &p_interaction->object_lock) ; + + 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_this Parent vlc_object - * \param i_id Identifier of the dialogue - * \return Either true or false +/** + * Helper function to communicate dialogue cancellations between the + * interface module and the caller + * + * \param p_dialog Dialog + * \return Either true or false */ -vlc_bool_t __intf_UserProgressIsCancelled( vlc_object_t *p_this, int i_id ) +bool intf_ProgressIsCancelled( interaction_dialog_t *p_dialog ) { - interaction_t *p_interaction = InteractionGet( p_this ); - interaction_dialog_t *p_dialog; - vlc_bool_t b_cancel; - - if( !p_interaction ) return VLC_TRUE; - - vlc_mutex_lock( &p_interaction->object_lock ); - p_dialog = DialogGetById( p_interaction, i_id ); - if( !p_dialog ) - { - vlc_mutex_unlock( &p_interaction->object_lock ) ; - return VLC_TRUE; - } + 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_mutex_unlock( &p_interaction->object_lock ); + 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 +/** + * 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 ) + const char *psz_title, + const char *psz_description, + char **ppsz_login, + char **ppsz_password ) { int i_ret; - DIALOG_INIT( TWOWAY ); + 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 ) + if( i_ret != DIALOG_CANCELLED && i_ret != VLC_EGENERIC ) { - assert( p_new->psz_returned[0] && p_new->psz_returned[1] ); - *ppsz_login = strdup( p_new->psz_returned[0] ); - *ppsz_password = strdup( p_new->psz_returned[1] ); + *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 +/** + * 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 ) + const char *psz_title, + const char *psz_description, + char **ppsz_usersString ) { int i_ret; - DIALOG_INIT( TWOWAY ); + 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 ); @@ -403,131 +315,160 @@ int __intf_UserStringInput( vlc_object_t *p_this, if( i_ret != DIALOG_CANCELLED ) { - assert( p_new->psz_returned[0] ); - *ppsz_usersString = strdup( p_new->psz_returned[0] ); + *ppsz_usersString = p_new->psz_returned[0]? + strdup( p_new->psz_returned[0] ) : NULL; } return i_ret; } -/** Hide an interaction dialog - * \param p_this the parent vlc object - * \param i_id the id of the item to hide +/** + * Hide an interaction dialog + * + * \param p_dialog the dialog to hide * \return nothing */ -void __intf_UserHide( vlc_object_t *p_this, int i_id ) +void intf_UserHide( interaction_dialog_t *p_dialog ) { - interaction_t *p_interaction = InteractionGet( p_this ); - interaction_dialog_t *p_dialog; - - if( !p_interaction ) return; - - vlc_mutex_lock( &p_interaction->object_lock ); - p_dialog = DialogGetById( p_interaction, i_id ); - - if( !p_dialog ) - { - vlc_mutex_unlock( &p_interaction->object_lock ); - return; - } + interaction_t *p_interaction = InteractionGet( p_dialog->p_parent ); + assert( p_interaction ); + vlc_object_lock( p_interaction ); p_dialog->i_status = ANSWERED_DIALOG; - vlc_mutex_unlock( &p_interaction->object_lock ); + vlc_cond_signal( &p_interaction->wait ); + vlc_object_unlock( p_interaction ); + vlc_object_release( p_interaction ); } -/********************************************************************** - * The following functions are local - **********************************************************************/ - -/* Get the interaction object. Create it if needed */ -static interaction_t * InteractionGet( vlc_object_t *p_this ) +/** + * Create the initial interaction object + * (should only be used in libvlc_InternalInit, LibVLC private) + * + * \return a vlc_object_t that should be freed when done. + */ +interaction_t * interaction_Init( libvlc_int_t *p_libvlc ) { - playlist_t *p_playlist; interaction_t *p_interaction; - p_playlist = (playlist_t*) vlc_object_find( p_this, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( !p_playlist ) + /* Make sure we haven't yet created an interaction object */ + assert( libvlc_priv(p_libvlc)->p_interaction == NULL ); + + p_interaction = vlc_custom_create( VLC_OBJECT(p_libvlc), + sizeof( *p_interaction ), + VLC_OBJECT_GENERIC, "interaction" ); + if( !p_interaction ) return NULL; - if( p_playlist->p_interaction == NULL ) - InteractionInit( p_playlist ); + vlc_object_attach( p_interaction, p_libvlc ); + p_interaction->i_dialogs = 0; + p_interaction->pp_dialogs = NULL; + p_interaction->p_intf = NULL; + p_interaction->i_last_id = 0; + + vlc_cond_init( &p_interaction->wait ); - p_interaction = p_playlist->p_interaction; + if( vlc_clone( &p_interaction->thread, InteractionLoop, p_interaction, + VLC_THREAD_PRIORITY_LOW ) ) + { + msg_Err( p_interaction, "Interaction control thread creation failed, " + "interaction will not be displayed" ); + vlc_object_detach( p_interaction ); + vlc_object_release( p_interaction ); + return NULL; + } - vlc_object_release( p_playlist ); return p_interaction; } -/* Create the interaction object in the given playlist object */ -static void InteractionInit( playlist_t *p_playlist ) +void interaction_Destroy( interaction_t *p_interaction ) { - interaction_t *p_interaction = vlc_object_create( VLC_OBJECT( p_playlist ), - sizeof( interaction_t ) ); if( !p_interaction ) - { - msg_Err( p_playlist,"out of memory" ); return; - } - - p_interaction->i_dialogs = 0; - p_interaction->pp_dialogs = NULL; - p_interaction->p_intf = NULL; - p_interaction->i_last_id = DIALOG_LAST_PREDEFINED + 1; - vlc_mutex_init( p_interaction , &p_interaction->object_lock ); + vlc_cancel( p_interaction->thread ); + vlc_join( p_interaction->thread, NULL ); + vlc_cond_destroy( &p_interaction->wait ); - p_playlist->p_interaction = p_interaction; + /* Remove all dialogs - Interfaces must be able to clean up their data */ + for( int i = p_interaction->i_dialogs -1 ; i >= 0; i-- ) + { + interaction_dialog_t * p_dialog = p_interaction->pp_dialogs[i]; + DialogDestroy( p_dialog ); + REMOVE_ELEM( p_interaction->pp_dialogs, p_interaction->i_dialogs, i ); + } + vlc_object_release( p_interaction ); } -/* Look for an interface suitable for interaction */ -static void InteractionSearchInterface( interaction_t *p_interaction ) +static vlc_mutex_t intf_lock = VLC_STATIC_MUTEX; + +int interaction_Register( intf_thread_t *intf ) { - vlc_list_t *p_list; - int i_index; + libvlc_priv_t *priv = libvlc_priv( intf->p_libvlc ); + int ret = VLC_EGENERIC; + + vlc_mutex_lock( &intf_lock ); + if( priv->p_interaction_intf == NULL ) + { /* Since the interface is responsible for unregistering itself before + * it terminates, an object reference is not needed. */ + priv->p_interaction_intf = intf; + ret = VLC_SUCCESS; + } + vlc_mutex_unlock( &intf_lock ); + return ret; +} - p_interaction->p_intf = NULL; +int interaction_Unregister( intf_thread_t *intf ) +{ + libvlc_priv_t *priv = libvlc_priv( intf->p_libvlc ); + int ret = VLC_EGENERIC; - p_list = vlc_list_find( p_interaction, VLC_OBJECT_INTF, FIND_ANYWHERE ); - if( !p_list ) + vlc_mutex_lock( &intf_lock ); + if( priv->p_interaction_intf == intf ) { - msg_Err( p_interaction, "unable to create module list" ); - return; + priv->p_interaction_intf = NULL; + ret = VLC_SUCCESS; } + vlc_mutex_unlock( &intf_lock ); + return ret; +} - for( i_index = 0; i_index < p_list->i_count; i_index ++ ) - { - intf_thread_t *p_intf = (intf_thread_t *) - p_list->p_values[i_index].p_object; - if( p_intf->b_interaction ) - { - p_interaction->p_intf = p_intf; - break; - } - } - vlc_list_release ( p_list ); +/********************************************************************** + * 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; } -/* Find an interaction dialog by its id */ -static interaction_dialog_t *DialogGetById( interaction_t *p_interaction, - int i_id ) + +/* Look for an interface suitable for interaction, and hold it. */ +static intf_thread_t *SearchInterface( interaction_t *p_interaction ) { - int i; - for( i = 0 ; i< p_interaction->i_dialogs; i++ ) - { - if( p_interaction->pp_dialogs[i]->i_id == i_id ) - return p_interaction->pp_dialogs[i]; - } - return NULL; + 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 ) { - FREENULL( p_dialog->psz_title ); - FREENULL( p_dialog->psz_description ); - FREENULL( p_dialog->psz_default_button ); - FREENULL( p_dialog->psz_alternate_button ); - FREENULL( p_dialog->psz_other_button ); + 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 ); } @@ -535,69 +476,151 @@ static void DialogDestroy( interaction_dialog_t *p_dialog ) * if required */ static int DialogSend( vlc_object_t *p_this, interaction_dialog_t *p_dialog ) { - interaction_t *p_interaction = InteractionGet( p_this ); + interaction_t *p_interaction; + intf_thread_t *p_intf; + + if( p_this->i_flags & OBJECT_FLAGS_NOINTERACT ) + return VLC_EGENERIC; - /* Get an id, if we don't already have one */ - if( p_dialog->i_id == 0 ) - p_dialog->i_id = ++p_interaction->i_last_id; + p_interaction = InteractionGet( p_dialog->p_parent ); + if( !p_interaction ) + return VLC_EGENERIC; - if( p_this->i_flags & OBJECT_FLAGS_NOINTERACT ) return VLC_EGENERIC; + p_intf = SearchInterface( p_interaction ); + if( p_intf == NULL ) + { + p_dialog->i_return = DIALOG_DEFAULT; /* Give default answer */ - if( config_GetInt(p_this, "interact") || + /* Pretend we have hidden and destroyed it */ + p_dialog->i_status = HIDING_DIALOG; + vlc_object_release( p_interaction ); + 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 ) { - vlc_bool_t b_found = VLC_FALSE; - int i; p_dialog->p_interaction = p_interaction; p_dialog->p_parent = p_this; /* Check if we have already added this dialog */ - vlc_mutex_lock( &p_interaction->object_lock ); - for( i = 0 ; i< p_interaction->i_dialogs; i++ ) - { - if( p_interaction->pp_dialogs[i]->i_id == p_dialog->i_id ) - b_found = VLC_TRUE; - } + vlc_object_lock( p_interaction ); /* 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; - vlc_mutex_unlock( &p_interaction->object_lock ); + 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 + 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 ); } - /// \todo locking ? 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" + /* Pretend we already retrieved the "answer" */ p_dialog->i_flags |= DIALOG_GOT_ANSWER; - vlc_mutex_unlock( &p_interaction->object_lock ); + 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) ); + for( ;; ) + { + int canc = vlc_savecancel(); + InteractionManage( p_interaction ); + vlc_restorecancel( canc ); + + vlc_cond_wait( &p_interaction->wait, &(vlc_internals(p_interaction)->lock) ); + } + vlc_cleanup_pop( ); + assert( 0 ); +} + +/** + * The main interaction processing loop + * + * \param p_interaction the interaction object + * \return nothing + */ + +static void InteractionManage( interaction_t *p_interaction ) +{ + vlc_value_t val; + int i_index; + + for( i_index = 0 ; i_index < p_interaction->i_dialogs; i_index ++ ) + { + interaction_dialog_t *p_dialog = p_interaction->pp_dialogs[i_index]; + switch( p_dialog->i_status ) + { + case ANSWERED_DIALOG: + /* Ask interface to hide it */ + p_dialog->i_action = INTERACT_HIDE; + val.p_address = p_dialog; + 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; + 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; + var_Set( p_dialog->p_interface, "interaction", val ); + break; + case DESTROYED_DIALOG: + /* Interface has now destroyed it, remove it */ + REMOVE_ELEM( p_interaction->pp_dialogs, p_interaction->i_dialogs, + i_index); + 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; + var_Set( p_dialog->p_interface, "interaction", val ); + p_dialog->i_status = SENT_DIALOG; + break; + } + } +}