Commit c85aed3c authored by Hannes Domani's avatar Hannes Domani Committed by Laurent Aimar

Global Hotkeys for windows

Signed-off-by: default avatarLaurent Aimar <fenrir@videolan.org>
parent 8bcd3c6f
...@@ -1191,6 +1191,7 @@ elif test "${SYS}" != "mingwce"; then ...@@ -1191,6 +1191,7 @@ elif test "${SYS}" != "mingwce"; then
VLC_ADD_PLUGIN([dmo]) VLC_ADD_PLUGIN([dmo])
VLC_ADD_PLUGIN([msn]) VLC_ADD_PLUGIN([msn])
VLC_ADD_LIBS([dmo],[-lole32 -luuid]) VLC_ADD_LIBS([dmo],[-lole32 -luuid])
VLC_ADD_PLUGIN([globalhotkeys])
else else
VLC_ADD_PLUGIN([win32text]) VLC_ADD_PLUGIN([win32text])
fi fi
......
...@@ -353,9 +353,17 @@ enum vlc_config_properties ...@@ -353,9 +353,17 @@ enum vlc_config_properties
add_int_inner( CONFIG_ITEM_INTEGER, name, text, longtext, advc, \ add_int_inner( CONFIG_ITEM_INTEGER, name, text, longtext, advc, \
p_callback, value ) p_callback, value )
#ifndef WIN32
#define add_key( name, value, p_callback, text, longtext, advc ) \ #define add_key( name, value, p_callback, text, longtext, advc ) \
add_int_inner( CONFIG_ITEM_KEY, name, text, longtext, advc, p_callback, \ add_int_inner( CONFIG_ITEM_KEY, name, text, longtext, advc, p_callback, \
value ) value )
#else
#define add_key( name, value, p_callback, text, longtext, advc ) \
add_int_inner( CONFIG_ITEM_KEY, name, text, longtext, advc, \
p_callback, value ) \
add_int_inner( CONFIG_ITEM_KEY, "global-" name, text, longtext, advc, \
p_callback, KEY_UNSET )
#endif
#define add_integer_with_range( name, value, i_min, i_max, p_callback, text, longtext, advc ) \ #define add_integer_with_range( name, value, i_min, i_max, p_callback, text, longtext, advc ) \
add_integer( name, value, p_callback, text, longtext, advc ) \ add_integer( name, value, p_callback, text, longtext, advc ) \
......
...@@ -5,6 +5,7 @@ SOURCES_telnet = telnet.c ...@@ -5,6 +5,7 @@ SOURCES_telnet = telnet.c
SOURCES_netsync = netsync.c SOURCES_netsync = netsync.c
SOURCES_ntservice = ntservice.c SOURCES_ntservice = ntservice.c
SOURCES_hotkeys = hotkeys.c SOURCES_hotkeys = hotkeys.c
SOURCES_globalhotkeys = globalhotkeys.c
SOURCES_lirc = lirc.c SOURCES_lirc = lirc.c
SOURCES_rc = rc.c SOURCES_rc = rc.c
SOURCES_dbus = dbus.c dbus.h SOURCES_dbus = dbus.c dbus.h
......
This diff is collapsed.
...@@ -896,6 +896,9 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, ...@@ -896,6 +896,9 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
* Always load the hotkeys interface if it exists * Always load the hotkeys interface if it exists
*/ */
libvlc_InternalAddIntf( p_libvlc, "hotkeys,none" ); libvlc_InternalAddIntf( p_libvlc, "hotkeys,none" );
#ifdef WIN32
libvlc_InternalAddIntf( p_libvlc, "globalhotkeys,none" );
#endif
#ifdef HAVE_DBUS #ifdef HAVE_DBUS
/* loads dbus control interface if in one-instance mode /* loads dbus control interface if in one-instance mode
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment