Include <libintl.h> only when really needed

[vlc] / src / libvlc.c

diff --git a/src/libvlc.c b/src/libvlc.c
index e4a1a8e780adf98d0062ef7d19f19cc179defed2..f6d6be839f313499ff001b9a2ad2b00482855994 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -66,6 +66,11 @@
 #   include <locale.h>
 #endif
 
+#ifdef ENABLE_NLS
+# undef gettext
+# include <libintl.h> /* bindtextdomain */
+#endif
+
 #ifdef HAVE_DBUS
 /* used for one-instance mode */
 #   include <dbus/dbus.h>
@@ -797,11 +802,25 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
      */
     var_Create( p_libvlc, "key-pressed", VLC_VAR_INTEGER );
     var_Create( p_libvlc, "key-action", VLC_VAR_INTEGER );
-    p_libvlc->p_hotkeys = malloc( libvlc_hotkeys_size );
-    /* Do a copy (we don't need to modify the strings) */
-    memcpy( p_libvlc->p_hotkeys, libvlc_hotkeys, libvlc_hotkeys_size );
-    var_AddCallback( p_libvlc, "key-pressed", vlc_key_to_action,
-                     p_libvlc->p_hotkeys );
+    {
+        struct hotkey *p_keys =
+            malloc( (libvlc_actions_count + 1) * sizeof (*p_keys) );
+
+       /* Initialize from configuration */
+        for( size_t i = 0; i < libvlc_actions_count; i++ )
+        {
+            p_keys[i].psz_action = libvlc_actions[i].name;
+            p_keys[i].i_key = config_GetInt( p_libvlc,
+                                             libvlc_actions[i].name );
+            p_keys[i].i_action = libvlc_actions[i].value;
+        }
+        p_keys[libvlc_actions_count].psz_action = NULL;
+        p_keys[libvlc_actions_count].i_key = 0;
+        p_keys[libvlc_actions_count].i_action = 0;
+        p_libvlc->p_hotkeys = p_keys;
+        var_AddCallback( p_libvlc, "key-pressed", vlc_key_to_action,
+                         p_keys );
+    }
 
     /* Initialize playlist and get commandline files */
     p_playlist = playlist_Create( VLC_OBJECT(p_libvlc) );
@@ -970,9 +989,9 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
      */
     var_Create( p_libvlc, "drawable-xid", VLC_VAR_INTEGER );
     var_Create( p_libvlc, "drawable-hwnd", VLC_VAR_ADDRESS );
-#ifdef __APPLE__
-    var_Create( p_libvlc, "drawable", VLC_VAR_INTEGER );
-#endif
+    var_Create( p_libvlc, "drawable-agl", VLC_VAR_INTEGER );
+    var_Create( p_libvlc, "drawable-gl", VLC_VAR_INTEGER );
+
     var_Create( p_libvlc, "drawable-view-top", VLC_VAR_INTEGER );
     var_Create( p_libvlc, "drawable-view-left", VLC_VAR_INTEGER );
     var_Create( p_libvlc, "drawable-view-bottom", VLC_VAR_INTEGER );
@@ -1093,8 +1112,8 @@ void libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
 
     FREENULL( priv->psz_configfile );
     var_DelCallback( p_libvlc, "key-pressed", vlc_key_to_action,
-                     p_libvlc->p_hotkeys );
-    FREENULL( p_libvlc->p_hotkeys );
+                     (void *)p_libvlc->p_hotkeys );
+    free( (void *)p_libvlc->p_hotkeys );
 }
 
 /**
@@ -1158,7 +1177,9 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, char const *psz_module )
                 psz_module = "dummy";
             else
 #endif
-                msg_Info( p_libvlc, _("Running vlc with the default interface. Use 'cvlc' to use vlc without interface.") );
+                msg_Info( p_libvlc, "%s",
+                          _("Running vlc with the default interface. "
+                            "Use 'cvlc' to use vlc without interface.") );
         }
         free( psz_interface );
     }
@@ -1974,7 +1995,7 @@ static void Version( void )
     utf8_fprintf( stdout, _("Compiled by %s@%s.%s\n"),
              VLC_CompileBy(), VLC_CompileHost(), VLC_CompileDomain() );
     utf8_fprintf( stdout, _("Compiler: %s\n"), VLC_Compiler() );
-    utf8_fprintf( stdout, LICENSE_MSG );
+    utf8_fprintf( stdout, "%s", LICENSE_MSG );
 
 #ifdef WIN32        /* Pause the console because it's destroyed when we exit */
     PauseConsole();