/*****************************************************************************
* interaction.c: User interaction functions
*****************************************************************************
- * Copyright (C) 1998-2004 VideoLAN
- * $Id: interface.c 10147 2005-03-05 17:18:30Z gbazin $
+ * Copyright (C) 2005-2006 VideoLAN
+ * $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
*
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/**
p_dialog->i_id = ++p_interaction->i_last_id;
}
+ if( p_this->i_flags & OBJECT_FLAGS_NOINTERACT )
+ {
+ return VLC_EGENERIC;
+ }
+
p_dialog->p_interaction = p_interaction;
p_dialog->p_parent = p_this;
/**
* Destroy the interaction system
+ * \param The interaction object to destroy
+ * \return nothing
*/
void intf_InteractionDestroy( interaction_t *p_interaction )
{
{
case ANSWERED_DIALOG:
// Ask interface to hide it
- msg_Dbg( p_interaction, "Hiding dialog %i", p_dialog->i_id );
p_dialog->i_action = INTERACT_HIDE;
val.p_address = p_dialog;
if( p_interaction->p_intf )
if( p_interaction->p_intf )
var_Set( p_interaction->p_intf, "interaction", val );
p_dialog->i_status = SENT_DIALOG;
- msg_Dbg( p_interaction, "Updating dialog %i, %i widgets",
- p_dialog->i_id, p_dialog->i_widgets );
break;
case HIDDEN_DIALOG:
if( !(p_dialog->i_flags & DIALOG_GOT_ANSWER) ) break;
if( !(p_dialog->i_flags & DIALOG_REUSABLE) )
{
- msg_Dbg( p_interaction, "Destroying dialog %i",
- p_dialog->i_id );
p_dialog->i_action = INTERACT_DESTROY;
val.p_address = p_dialog;
if( p_interaction->p_intf )
}
break;
case DESTROYED_DIALOG:
- msg_Dbg( p_interaction, "Removing dialog %i",
- p_dialog->i_id );
// Interface has now destroyed it, remove it
REMOVE_ELEM( p_interaction->pp_dialogs, p_interaction->i_dialogs,
i_index);
intf_Interact( p_this, p_new );
}
-/** Helper function to make a login/password box
+/** Helper function to ask a yes-no question
* \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_UserYesNo( vlc_object_t *p_this,
return p_new->i_id;
}
+
/** Update a progress bar
* \param p_this Parent vlc_object
* \param i_id Identifier of the dialog
vlc_mutex_lock( &p_interaction->object_lock );
p_dialog = intf_InteractionGetById( p_this, i_id );
- if( !p_dialog ) return;
+ if( !p_dialog )
+ {
+ vlc_mutex_unlock( &p_interaction->object_lock ) ;
+ return;
+ }
if( p_dialog->pp_widgets[0]->psz_text )
free( p_dialog->pp_widgets[0]->psz_text );
vlc_mutex_unlock( &p_interaction->object_lock) ;
}
-
-
-/** Helper function to ask a yes-no question
+/** Helper function to make a login/password box
* \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,
vlc_mutex_lock( &p_interaction->object_lock );
p_dialog = intf_InteractionGetById( p_this, i_id );
- if( !p_dialog ) return;
+ if( !p_dialog )
+ {
+ vlc_mutex_unlock( &p_interaction->object_lock );
+ return;
+ }
p_dialog->i_status = ANSWERED_DIALOG;
vlc_mutex_unlock( &p_interaction->object_lock );
}
/* Add a dialog to the queue and wait for answer */
-static int intf_WaitAnswer( interaction_t *p_interact, interaction_dialog_t *p_dialog )
+static int intf_WaitAnswer( interaction_t *p_interact,
+ interaction_dialog_t *p_dialog )
{
int i;
vlc_bool_t b_found = VLC_FALSE;
}
/* Add a dialog to the queue and return */
-static int intf_Send( interaction_t *p_interact, interaction_dialog_t *p_dialog )
+static int intf_Send( interaction_t *p_interact,
+ interaction_dialog_t *p_dialog )
{
int i;
vlc_bool_t b_found = VLC_FALSE;
+ if( p_interact == NULL ) return VLC_ENOOBJ;
vlc_mutex_lock( &p_interact->object_lock );
for( i = 0 ; i< p_interact->i_dialogs; i++ )