mirror of https://code.videolan.org/videolan/vlc
* 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:
parent
46b44b39fd
commit
03562f42d3
|
@ -63,8 +63,7 @@ static void intf_InteractionDialogDestroy(
|
|||
* \param p_interact the interaction element
|
||||
* \return VLC_SUCCESS or an error code
|
||||
*/
|
||||
int __intf_Interact( vlc_object_t *p_this, interaction_dialog_t *
|
||||
p_dialog )
|
||||
int __intf_Interact( vlc_object_t *p_this, interaction_dialog_t *p_dialog )
|
||||
{
|
||||
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;
|
||||
}
|
||||
|
||||
if( p_this->i_flags & OBJECT_FLAGS_NOINTERACT )
|
||||
{
|
||||
return VLC_EGENERIC;
|
||||
}
|
||||
if( p_this->i_flags & OBJECT_FLAGS_NOINTERACT ) return VLC_EGENERIC;
|
||||
|
||||
if( !config_GetInt(p_this, "interact") ) return VLC_EGENERIC;
|
||||
|
||||
p_dialog->p_interaction = p_interaction;
|
||||
p_dialog->p_parent = p_this;
|
||||
|
|
|
@ -113,6 +113,11 @@ static char *ppsz_snap_formats[] =
|
|||
"When this is enabled, the interface is shown when you move the mouse to "\
|
||||
"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
|
||||
|
@ -1584,6 +1589,8 @@ vlc_module_begin();
|
|||
add_bool( "color", 0, NULL, COLOR_TEXT, COLOR_LONGTEXT, VLC_TRUE );
|
||||
add_bool( "advanced", 0, NULL, ADVANCED_TEXT, ADVANCED_LONGTEXT,
|
||||
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,
|
||||
VLC_FALSE );
|
||||
|
|
Loading…
Reference in New Issue