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

vlc: start hotkeys interface explicitly 

The actions of the hotkeys interface all affect the playlist, the
playlist's input, the playlist's input's vout(s), the playlist's aout
or the interfaces (controller). It has no use outside VLC.
This commit is contained in:
Rémi Denis-Courmont 2012-11-01 22:55:22 +02:00
parent 360a96dde6
commit 62d68cd9c1
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/vlc.c
View File

@ -239,6 +239,7 @@ int main( int i_argc, const char *ppsz_argv[] )
libvlc_set_exit_handler (vlc, vlc_kill, &self);
libvlc_set_user_agent (vlc, "VLC media player", "VLC/"PACKAGE_VERSION);
libvlc_add_intf (vlc, "hotkeys,none");
#if !defined (HAVE_MAEMO) && !defined __APPLE__ && !defined (__OS2__)
libvlc_add_intf (vlc, "globalhotkeys,none");
#endif

1
bin/winvlc.c
View File

@ -147,6 +147,7 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
if (vlc != NULL)
{
libvlc_set_user_agent (vlc, "VLC media player", "VLC/"PACKAGE_VERSION);
libvlc_add_intf (vlc, "hotkeys,none");
libvlc_add_intf (vlc, "globalhotkeys,none");
libvlc_add_intf (vlc, NULL);
libvlc_playlist_play (vlc, -1, 0, NULL);

5
src/libvlc.c
View File

@ -525,11 +525,6 @@ dbus_out:
free( psz_modules );
free( psz_control );
/*
* Always load the hotkeys interface if it exists
*/
intf_Create( p_libvlc, "hotkeys,none" );
if( var_InheritBool( p_libvlc, "file-logging" )
#ifdef HAVE_SYSLOG_H
&& !var_InheritBool( p_libvlc, "syslog" )