videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

* src/libvlc.h, src/interface/interaction.c: new config option to disable interaction mode. Default value is set to disable for now because this mode is currently broken.

This commit is contained in:
Gildas Bazin 2006-06-10 22:21:37 +00:00
parent 46b44b39fd
commit 03562f42d3
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/interface/interaction.c
View File

@ -63,8 +63,7 @@ static void intf_InteractionDialogDestroy(
* \param p_interact the interaction element * \param p_interact the interaction element
* \return VLC_SUCCESS or an error code * \return VLC_SUCCESS or an error code
*/ */
int __intf_Interact( vlc_object_t *p_this, interaction_dialog_t * int __intf_Interact( vlc_object_t *p_this, interaction_dialog_t *p_dialog )
p_dialog )
{ {
interaction_t *p_interaction = intf_InteractionGet( p_this ); interaction_t *p_interaction = intf_InteractionGet( p_this );
@ -74,10 +73,9 @@ int __intf_Interact( vlc_object_t *p_this, interaction_dialog_t *
p_dialog->i_id = ++p_interaction->i_last_id; p_dialog->i_id = ++p_interaction->i_last_id;
} }
if( p_this->i_flags & OBJECT_FLAGS_NOINTERACT ) if( p_this->i_flags & OBJECT_FLAGS_NOINTERACT ) return VLC_EGENERIC;
{
return VLC_EGENERIC; if( !config_GetInt(p_this, "interact") ) return VLC_EGENERIC;
}
p_dialog->p_interaction = p_interaction; p_dialog->p_interaction = p_interaction;
p_dialog->p_parent = p_this; p_dialog->p_parent = p_this;

7
src/libvlc.h
View File

@ -113,6 +113,11 @@ static char *ppsz_snap_formats[] =
"When this is enabled, the interface is shown when you move the mouse to "\ "When this is enabled, the interface is shown when you move the mouse to "\
"the edge of the screen in fullscreen mode." ) "the edge of the screen in fullscreen mode." )
#define INTERACTION_TEXT N_("Interface interaction")
#define INTERACTION_LONGTEXT N_( \
"When this is enabled, the interface will show a dialog box each time " \
"some user input is required." )
/***************************************************************************** /*****************************************************************************
* Audio * Audio
@ -1584,6 +1589,8 @@ vlc_module_begin();
add_bool( "color", 0, NULL, COLOR_TEXT, COLOR_LONGTEXT, VLC_TRUE ); add_bool( "color", 0, NULL, COLOR_TEXT, COLOR_LONGTEXT, VLC_TRUE );
add_bool( "advanced", 0, NULL, ADVANCED_TEXT, ADVANCED_LONGTEXT, add_bool( "advanced", 0, NULL, ADVANCED_TEXT, ADVANCED_LONGTEXT,
VLC_FALSE ); VLC_FALSE );
add_bool( "interact", VLC_FALSE, NULL, INTERACTION_TEXT,
INTERACTION_LONGTEXT, VLC_FALSE );
add_bool( "show-intf", VLC_FALSE, NULL, SHOWINTF_TEXT, SHOWINTF_LONGTEXT, add_bool( "show-intf", VLC_FALSE, NULL, SHOWINTF_TEXT, SHOWINTF_LONGTEXT,
VLC_FALSE ); VLC_FALSE );