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.

diff --git a/bin/vlc.c b/bin/vlc.c
index 9bc0dad66bd7226c1e8f82389ec35ca629f3f961..198f28fd31e41b9d1c9de11d5b372c0efe043e94 100644 (file)
--- a/bin/vlc.c
+++ b/bin/vlc.c
@@ -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

diff --git a/bin/winvlc.c b/bin/winvlc.c
index 1f0af41ed2bbfff18a70031cfee25e9fb6c0389d..b1631e1f9e3b14a57db6d6097d401fc3a2aa5796 100644 (file)
--- a/bin/winvlc.c
+++ b/bin/winvlc.c
@@ -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);

diff --git a/src/libvlc.c b/src/libvlc.c
index 9936c03b9d7d7e3e6fca8620fcee4080596c216d..58568432fe6033bd9e71d413f697ef47ce344c91 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -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" )