[vlc-devel] commit: Do not reload the module bank if the language is overriden ( Rémi Denis-Courmont )

git version control git at videolan.org
Sat Jan 23 19:28:54 CET 2010


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Jan 23 20:19:42 2010 +0200| [bacc63395311e793355e3762764c8af1ec7143be] | committer: Rémi Denis-Courmont 

Do not reload the module bank if the language is overriden

The module bank is now locale-independent, so this was a waste fo time.

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

 src/libvlc.c |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/src/libvlc.c b/src/libvlc.c
index 7a2bce9..e8858f1 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -427,9 +427,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
 #if defined( ENABLE_NLS ) \
      && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
 # if defined (WIN32) || defined (__APPLE__)
-    /* This ain't really nice to have to reload the config here but it seems
-     * the only way to do it. */
-
     if( !var_InheritBool( p_libvlc, "ignore-config" ) )
         config_LoadConfigFile( p_libvlc, "main" );
     config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true );
@@ -444,13 +441,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
 
         /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */
         msg_Dbg( p_libvlc, "translation test: code is \"%s\"", _("C") );
-
-        module_EndBank( p_libvlc, false );
-        module_InitBank( p_libvlc );
-        if( !var_InheritBool( p_libvlc, "ignore-config" ) )
-            config_LoadConfigFile( p_libvlc, "main" );
-        config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true );
-        priv->i_verbose = var_InheritInteger( p_libvlc, "verbose" );
     }
     free( psz_language );
 # endif




More information about the vlc-devel mailing list