Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
b7320893
Commit
b7320893
authored
Jan 25, 2009
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added x11 global hotkeys support (linux).
parent
e939adf8
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
370 additions
and
3 deletions
+370
-3
configure.ac
configure.ac
+3
-0
include/vlc_plugin.h
include/vlc_plugin.h
+1
-1
modules/control/Modules.am
modules/control/Modules.am
+0
-1
modules/control/globalhotkeys/Modules.am
modules/control/globalhotkeys/Modules.am
+2
-0
modules/control/globalhotkeys/win32.c
modules/control/globalhotkeys/win32.c
+1
-1
modules/control/globalhotkeys/x11.c
modules/control/globalhotkeys/x11.c
+363
-0
No files found.
configure.ac
View file @
b7320893
...
@@ -3886,6 +3886,9 @@ if test "${enable_x11}" != "no" &&
...
@@ -3886,6 +3886,9 @@ if test "${enable_x11}" != "no" &&
VLC_ADD_PLUGIN([panoramix])
VLC_ADD_PLUGIN([panoramix])
VLC_ADD_LIBS([panoramix],[${X_LIBS} ${X_PRE_LIBS} -lX11])
VLC_ADD_LIBS([panoramix],[${X_LIBS} ${X_PRE_LIBS} -lX11])
VLC_ADD_CPPFLAGS([panoramix],[${X_CFLAGS}])
VLC_ADD_CPPFLAGS([panoramix],[${X_CFLAGS}])
VLC_ADD_PLUGIN([globalhotkeys])
VLC_ADD_LIBS([globalhotkeys],[${X_LIBS} ${X_PRE_LIBS} -lX11])
VLC_ADD_CPPFLAGS([globalhotkeys],[${X_CFLAGS}])
AC_CHECK_LIB(Xext, XShmAttach, [
AC_CHECK_LIB(Xext, XShmAttach, [
VLC_ADD_PLUGIN([x11])
VLC_ADD_PLUGIN([x11])
VLC_ADD_LIBS([x11],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext])
VLC_ADD_LIBS([x11],[${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext])
...
...
include/vlc_plugin.h
View file @
b7320893
...
@@ -353,7 +353,7 @@ enum vlc_config_properties
...
@@ -353,7 +353,7 @@ 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 )
#if
ndef WIN32
#if
!defined(WIN32) && !defined(SYS_LINUX)
#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 )
...
...
modules/control/Modules.am
View file @
b7320893
...
@@ -5,7 +5,6 @@ SOURCES_telnet = telnet.c
...
@@ -5,7 +5,6 @@ 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
...
...
modules/control/globalhotkeys/Modules.am
View file @
b7320893
if HAVE_WIN32
if HAVE_WIN32
globalhotkeys_extra = win32.c
globalhotkeys_extra = win32.c
else
globalhotkeys_extra = x11.c
endif
endif
SOURCES_globalhotkeys = \
SOURCES_globalhotkeys = \
...
...
modules/control/globalhotkeys/win32.c
View file @
b7320893
/*****************************************************************************
/*****************************************************************************
*
globalhotkeys.c: Global-Hotkey
handling for vlc
*
win32.c: Global-Hotkey WIN32
handling for vlc
*****************************************************************************
*****************************************************************************
* Copyright (C) 2008-2009 the VideoLAN team
* Copyright (C) 2008-2009 the VideoLAN team
*
*
...
...
modules/control/globalhotkeys/x11.c
0 → 100644
View file @
b7320893
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment