The current libvlc-control ABI is not compatible with the 0.8.6 one. Change SONAME.

[vlc] / src / libvlc-common.c

diff --git a/src/libvlc-common.c b/src/libvlc-common.c
index af6982f5546b178e55a0daf5d16dd1c37ede5ebd..01a329fdd5c7b9b2b829c1c8f4e9f050402cfd20 100644 (file)
--- a/src/libvlc-common.c
+++ b/src/libvlc-common.c
@@ -41,7 +41,7 @@
 
 #include <errno.h>                                                 /* ENOMEM */
 #include <stdio.h>                                              /* sprintf() */
-#include <string.h>                                            /* strerror() */
+#include <string.h>
 #include <stdlib.h>                                                /* free() */
 
 #ifndef WIN32
@@ -198,20 +198,23 @@ libvlc_int_t * libvlc_InternalCreate( void )
 
     /* Initialize message queue */
     msg_Create( p_libvlc );
-    /* Announce who we are - Do it only for first instance ? */
-    msg_Dbg( p_libvlc, COPYRIGHT_MESSAGE );
-    msg_Dbg( p_libvlc, "libvlc was configured with %s", CONFIGURE_LINE );
 
     /* Find verbosity from VLC_VERBOSE environment variable */
     psz_env = getenv( "VLC_VERBOSE" );
-    p_libvlc->i_verbose = psz_env ? atoi( psz_env ) : -1;
-
+    if( psz_env != NULL )
+        p_libvlc->i_verbose = atoi( psz_env );
+    else
+        p_libvlc->i_verbose = 3;
 #if defined( HAVE_ISATTY ) && !defined( WIN32 )
     p_libvlc->b_color = isatty( 2 ); /* 2 is for stderr */
 #else
     p_libvlc->b_color = VLC_FALSE;
 #endif
 
+    /* Announce who we are - Do it only for first instance ? */
+    msg_Dbg( p_libvlc, COPYRIGHT_MESSAGE );
+    msg_Dbg( p_libvlc, "libvlc was configured with %s", CONFIGURE_LINE );
+
     /* Initialize mutexes */
     vlc_mutex_init( p_libvlc, &p_libvlc->config_lock );
 #ifdef __APPLE__
@@ -272,10 +275,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] )
     /*
      * Support for gettext
      */
-#ifdef HAVE_LC_MESSAGES
-    setlocale( LC_MESSAGES, "" );
-#endif
-    setlocale( LC_CTYPE, "" );
     LoadMessages ();
 
     /* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */
@@ -374,8 +373,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] )
             }
             else
             {
-                msg_Err( p_libvlc, "cannot open pid file for writing: %s (%s)",
-                         psz_pidfile, strerror(errno) );
+                msg_Err( p_libvlc, "cannot open pid file for writing: %s (%m)",
+                         psz_pidfile );
             }
         }
         free( psz_pidfile );
@@ -640,7 +639,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] )
 
                     /* append MRLs */
                     dbus_message_iter_init_append( p_dbus_msg, &dbus_args );
-                    if ( !dbus_message_iter_append_basic( &dbus_args, 
+                    if ( !dbus_message_iter_append_basic( &dbus_args,
                                 DBUS_TYPE_STRING, &ppsz_argv[i_input] ) )
                     {
                         msg_Err( p_libvlc, "Out of memory" );
@@ -819,7 +818,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] )
     }
     else if( psz_control && *psz_control )
     {
-        if( psz_modules ) free( psz_modules );
+        free( psz_modules );
         psz_modules = strdup( psz_control );
     }
 
@@ -842,10 +841,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] )
             free( psz_temp );
         }
     }
-    if ( psz_modules )
-    {
-        free( psz_modules );
-    }
+    free( psz_modules );
+    free( psz_control );
 
     /*
      * Always load the hotkeys interface if it exists
@@ -1035,8 +1032,8 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, vlc_bool_t b_release )
             msg_Dbg( p_libvlc, "removing pid file %s", psz_pidfile );
             if( unlink( psz_pidfile ) == -1 )
             {
-                msg_Dbg( p_libvlc, "removing pid file %s: failed: %s",
-                        psz_pidfile, strerror(errno) );
+                msg_Dbg( p_libvlc, "removing pid file %s: %m",
+                        psz_pidfile );
             }
         }
         free ( psz_pidfile );
@@ -1084,7 +1081,7 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, vlc_bool_t b_release )
     p_libvlc = NULL;
 
     /* Stop thread system: last one out please shut the door!
-     * The number of initializations of the thread system is counted, we 
+     * The number of initializations of the thread system is counted, we
      * can call this each time */
     vlc_threads_end( p_libvlc_global );
 
@@ -1132,15 +1129,27 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc,
 
     /* Try to run the interface */
     p_intf->b_play = b_play;
-    p_intf->b_block = b_block;
     i_err = intf_RunThread( p_intf );
-    if( i_err )
+    if( i_err || p_intf->b_should_run_on_first_thread )
     {
         vlc_object_detach( p_intf );
         intf_Destroy( p_intf );
         p_intf = NULL;
         return i_err;
     }
+
+    if( b_block )
+    {
+        /* FIXME: should be moved to interface/interface.c */
+        if( p_intf->pf_run )
+            vlc_thread_join( p_intf );
+        else
+            while( vlc_object_lock_and_wait( p_intf ) == 0 );
+
+        vlc_object_detach( p_intf );
+        intf_Destroy( p_intf );
+    }
+
     return VLC_SUCCESS;
 };
 
@@ -1198,7 +1207,7 @@ static inline int LoadMessages (void)
     }
 
     /* LibVLC wants all messages in UTF-8.
-     * Unfortunately, we cannot ask UTF-8 for strerror(), strsignal()
+     * Unfortunately, we cannot ask UTF-8 for strerror_r(), strsignal_r()
      * and other functions that are not part of our text domain.
      */
     if (bind_textdomain_codeset (PACKAGE_NAME, "UTF-8") == NULL)