[vlc-devel] commit: libvlc: intf-show and intf-popmenu must be created before interfaces are launched (via use of --extraintf) (Erwan Tulou )
git version control
git at videolan.org
Tue Feb 16 15:33:55 CET 2010
vlc | branch: master | Erwan Tulou <erwan10 at videolan.org> | Tue Feb 16 15:16:32 2010 +0100| [902b4cd3a9b1f0e44deb3f7bbf67c0246e1101da] | committer: Erwan Tulou
libvlc: intf-show and intf-popmenu must be created before interfaces are launched (via use of --extraintf)
This fixes 'vlc -I rc --extraintf skins' that fails to add a callback to these
variables because they are not yet created
(pointed out by assert failed in debug mode when calling var_DelCallback)
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=902b4cd3a9b1f0e44deb3f7bbf67c0246e1101da
---
src/libvlc.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/libvlc.c b/src/libvlc.c
index 58f588a..fc7ad39 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -794,6 +794,13 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
*/
vlc_InitActions( p_libvlc );
+ /* Create a variable for showing the fullscreen interface */
+ var_Create( p_libvlc, "intf-show", VLC_VAR_BOOL );
+ var_SetBool( p_libvlc, "intf-show", true );
+
+ /* Create a variable for showing the right click menu */
+ var_Create( p_libvlc, "intf-popupmenu", VLC_VAR_BOOL );
+
/* variables for signalling creation of new files */
var_Create( p_libvlc, "snapshot-file", VLC_VAR_STRING );
var_Create( p_libvlc, "record-file", VLC_VAR_STRING );
@@ -950,13 +957,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
var_Create( p_libvlc, "drawable-clip-right", VLC_VAR_INTEGER );
- /* Create a variable for showing the fullscreen interface from hotkeys */
- var_Create( p_libvlc, "intf-show", VLC_VAR_BOOL );
- var_SetBool( p_libvlc, "intf-show", true );
-
- /* Create a variable for showing the right click menu */
- var_Create( p_libvlc, "intf-popupmenu", VLC_VAR_BOOL );
-
/*
* Get input filenames given as commandline arguments
*/
More information about the vlc-devel
mailing list