X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.c;h=9fcf4970a5f2f67e04960d9516b7cf8aad4e02e7;hb=8fcd56ee183c22477c409612dab6f581017a99bb;hp=770a2889b793044f679ca8d9eb58aece385cba20;hpb=b1be8713bcf652b21ff7d6678c7155a0031ed104;p=vlc

diff --git a/src/libvlc.c b/src/libvlc.c
index 770a2889b7..9fcf4970a5 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -92,6 +92,8 @@ static vlc_t *    p_static_vlc;
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
+static void LocaleInit( void );
+static void LocaleDeinit( void );
 static void SetLanguage   ( char const * );
 static int  GetFilenames  ( vlc_t *, int, char *[] );
 static void Help          ( vlc_t *, char const *psz_help_name );
@@ -191,18 +193,6 @@ int VLC_Create( void )
         libvlc.b_color = VLC_FALSE;
 #endif
 
-        /*
-         * Global iconv
-         */
-        if( !vlc_current_charset( &psz_env ) )
-        {
-            vlc_mutex_init( p_libvlc, &libvlc.from_locale_lock );
-            vlc_mutex_init( p_libvlc, &libvlc.to_locale_lock );
-            libvlc.from_locale = vlc_iconv_open( "UTF-8", psz_env );
-            libvlc.to_locale = vlc_iconv_open( psz_env, "UTF-8" );
-        }
-        free( psz_env );
-
         /* Initialize message queue */
         msg_Create( p_libvlc );
 
@@ -214,6 +204,9 @@ int VLC_Create( void )
         libvlc.p_module_bank = NULL;
 
         libvlc.b_ready = VLC_TRUE;
+
+        /* UTF-8 convertor are initialized after the locale */
+        libvlc.from_locale = libvlc.to_locale = (vlc_iconv_t)(-1);
     }
     vlc_mutex_unlock( lockval.p_address );
     var_Destroy( p_libvlc, "libvlc" );
@@ -265,7 +258,10 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] )
     module_t    *p_help_module;
     playlist_t  *p_playlist;
     vlc_value_t  val;
+#if defined( ENABLE_NLS ) \
+     && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
     char *       psz_language;
+#endif
 
     if( !p_vlc )
     {
@@ -297,6 +293,12 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] )
      */
     SetLanguage( "" );
 
+    /*
+     * Global iconv, must be done after setlocale()
+     * so that vlc_current_charset() works.
+     */
+    LocaleInit();
+
     /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */
     msg_Dbg( p_vlc, "translation test: code is \"%s\"", _("C") );
 
@@ -427,6 +429,8 @@ int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] )
 
         /* Reset the default domain */
         SetLanguage( psz_language );
+        LocaleDeinit();
+        LocaleInit();
 
         /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */
         msg_Dbg( p_vlc, "translation test: code is \"%s\"", _("C") );
@@ -978,13 +982,7 @@ int VLC_Destroy( int i_object )
     msg_Destroy( p_libvlc );
 
     /* Destroy global iconv */
-    if( libvlc.to_locale != (vlc_iconv_t)(-1) )
-    {
-        vlc_mutex_destroy( &libvlc.from_locale_lock );
-        vlc_mutex_destroy( &libvlc.to_locale_lock );
-        vlc_iconv_close( libvlc.from_locale );
-        vlc_iconv_close( libvlc.to_locale );
-    }
+    LocaleDeinit();
 
     /* Destroy mutexes */
     vlc_mutex_destroy( &p_vlc->config_lock );
@@ -1265,6 +1263,7 @@ vlc_bool_t VLC_IsPlaying( int i_object )
 {
     playlist_t * p_playlist;
     vlc_bool_t   b_playing;
+    vlc_value_t  val;
 
     vlc_t *p_vlc = vlc_current_object( i_object );
 
@@ -1281,8 +1280,13 @@ vlc_bool_t VLC_IsPlaying( int i_object )
         if( i_object ) vlc_object_release( p_vlc );
         return VLC_ENOOBJ;
     }
-
-    b_playing = playlist_IsPlaying( p_playlist );
+    if( !p_playlist->p_input )
+    {
+        if( i_object ) vlc_object_release( p_vlc );
+        return VLC_ENOOBJ;
+    }
+    var_Get( p_playlist->p_input, "state", &val );
+    b_playing = ( val.i_int == PLAYING_S );
     vlc_object_release( p_playlist );
 
     if( i_object ) vlc_object_release( p_vlc );
@@ -1838,6 +1842,39 @@ int VLC_FullScreen( int i_object )
 
 /* following functions are local */
 
+static void LocaleInit( void )
+{
+    char *psz_charset;
+
+    if( !vlc_current_charset( &psz_charset ) )
+    {
+        vlc_mutex_init( p_libvlc, &libvlc.from_locale_lock );
+        vlc_mutex_init( p_libvlc, &libvlc.to_locale_lock );
+        libvlc.from_locale = vlc_iconv_open( "UTF-8", psz_charset );
+        libvlc.to_locale = vlc_iconv_open( psz_charset, "UTF-8" );
+        if( !libvlc.to_locale )
+        {
+            // Not sure it is the right thing to do, but at least it
+            // doesn't make vlc crash with msvc !
+            libvlc.to_locale = (vlc_iconv_t)(-1);
+        }
+    }
+    else
+        libvlc.from_locale = libvlc.to_locale = (vlc_iconv_t)(-1);
+    free( psz_charset );
+}
+
+static void LocaleDeinit( void )
+{
+    if( libvlc.to_locale != (vlc_iconv_t)(-1) )
+    {
+        vlc_mutex_destroy( &libvlc.from_locale_lock );
+        vlc_mutex_destroy( &libvlc.to_locale_lock );
+        vlc_iconv_close( libvlc.from_locale );
+        vlc_iconv_close( libvlc.to_locale );
+    }
+}
+
 /*****************************************************************************
  * SetLanguage: set the interface language.
  *****************************************************************************
@@ -1881,6 +1918,7 @@ static void SetLanguage ( char const *psz_lang )
 #endif
 
         setlocale( LC_ALL, psz_lang );
+        setlocale(LC_NUMERIC, "C" );
     }
 
     /* Specify where to find the locales for current domain */
@@ -2064,7 +2102,7 @@ static void Usage( vlc_t *p_this, char const *psz_module_name )
             char *psz_text, *psz_spaces = psz_spaces_text;
             char *psz_bra = NULL, *psz_type = NULL, *psz_ket = NULL;
             char *psz_suf = "", *psz_prefix = NULL;
-            size_t i;
+            signed int i;
 
             /* Skip deprecated options */
             if( p_item->psz_current )