[vlc-commits] vlc: start hotkeys interface explicitly

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Nov  1 22:55:22 2012 +0200| [62d68cd9c1899006637cdae0a31540bbff550012] | committer: Rémi Denis-Courmont

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.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=62d68cd9c1899006637cdae0a31540bbff550012
---

 bin/vlc.c    |    1 +
 bin/winvlc.c |    1 +
 src/libvlc.c |    5 -----
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/bin/vlc.c b/bin/vlc.c
index 9bc0dad..198f28f 100644
--- 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 1f0af41..b1631e1 100644
--- 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 9936c03..5856843 100644
--- 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" )