Remove the ShowIntf module. It doesn't make sense when MacOS and Qt gui have a fullsc...

[vlc] / src / libvlc.c

diff --git a/src/libvlc.c b/src/libvlc.c
index 519efa1ede4360db70536374148931682500592b..9dc80c6352eeff9e41a89a375f9471571b73ec52 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -195,7 +195,7 @@ void vlc_release (gc_object_t *p_gc)
     assert (refs != (uintptr_t)(-1)); /* reference underflow?! */
     if (refs == 0)
     {
-#ifdef USE_SYNC
+#if defined (__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)
 #elif defined (WIN32) && defined (__GNUC__)
 #elif defined(__APPLE__)
 #else
@@ -641,7 +641,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
                     {
                         msg_Err( p_libvlc, "D-Bus problem" );
                         system_End( p_libvlc );
-                        exit( VLC_ETIMEOUT );
+                        exit( 1 );
                     }
 
                     /* append MRLs */
@@ -651,7 +651,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
                     {
                         dbus_message_unref( p_dbus_msg );
                         system_End( p_libvlc );
-                        exit( VLC_ENOMEM );
+                        exit( 1 );
                     }
                     b_play = TRUE;
                     if( config_GetInt( p_libvlc, "playlist-enqueue" ) > 0 )
@@ -661,7 +661,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
                     {
                         dbus_message_unref( p_dbus_msg );
                         system_End( p_libvlc );
-                        exit( VLC_ENOMEM );
+                        exit( 1 );
                     }
 
                     /* send message and get a handle for a reply */
@@ -671,7 +671,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
                         msg_Err( p_libvlc, "D-Bus problem" );
                         dbus_message_unref( p_dbus_msg );
                         system_End( p_libvlc );
-                        exit( VLC_ETIMEOUT );
+                        exit( 1 );
                     }
 
                     if ( NULL == p_dbus_pending )
@@ -679,7 +679,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
                         msg_Err( p_libvlc, "D-Bus problem" );
                         dbus_message_unref( p_dbus_msg );
                         system_End( p_libvlc );
-                        exit( VLC_ETIMEOUT );
+                        exit( 1 );
                     }
                     dbus_connection_flush( p_conn );
                     dbus_message_unref( p_dbus_msg );
@@ -690,7 +690,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
 
                 /* bye bye */
                 system_End( p_libvlc );
-                exit( VLC_SUCCESS );
+                exit( 0 );
             }
         }
         /* we unreference the connection when we've finished with it */
@@ -733,6 +733,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
         var_SetInteger( p_libvlc, "verbose", -1 );
         priv->i_verbose = -1;
     }
+    vlc_threads_setup( p_libvlc );
 
     if( priv->b_color )
         priv->b_color = config_GetInt( p_libvlc, "color" ) > 0;
@@ -944,11 +945,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
     }
 #endif
 
-    if( config_GetInt( p_libvlc, "show-intf" ) > 0 )
-    {
-        intf_Create( p_libvlc, "showintf,none" );
-    }
-
     if( config_GetInt( p_libvlc, "network-synchronisation") > 0 )
     {
         intf_Create( p_libvlc, "netsync,none" );
@@ -985,10 +981,11 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
     /* Create volume callback system. */
     var_Create( p_libvlc, "volume-change", VLC_VAR_BOOL );
 
-    /* Create a variable for showing the interface (moved from playlist). */
+    /* Create a variable for showing the fullscreen interface from hotkeys */
     var_Create( p_libvlc, "intf-show", VLC_VAR_BOOL );
     var_SetBool( p_libvlc, "intf-show", true );
 
+    /* Create a variable for showing the right click menu */
     var_Create( p_libvlc, "intf-popupmenu", VLC_VAR_BOOL );
 
     /*
@@ -1158,7 +1155,7 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, char const *psz_module )
     if( intf_Create( p_libvlc, psz_module ? psz_module : "$intf" ) )
     {
         msg_Err( p_libvlc, "interface \"%s\" initialization failed",
-                 psz_module );
+                 psz_module ? psz_module : "default" );
         return VLC_EGENERIC;
     }
     return VLC_SUCCESS;
@@ -1846,11 +1843,11 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search )
     {
         if( b_color )
             utf8_fprintf( stdout, "\n" WHITE "%s" GRAY "\n",
-                       _( "No matching module found. Use --list or" \
+                       _( "No matching module found. Use --list or " \
                           "--list-verbose to list available modules." ) );
         else
             utf8_fprintf( stdout, "\n%s\n",
-                       _( "No matching module found. Use --list or" \
+                       _( "No matching module found. Use --list or " \
                           "--list-verbose to list available modules." ) );
     }
 
@@ -1946,11 +1943,13 @@ static void ListModules( libvlc_int_t *p_this, bool b_verbose )
  *****************************************************************************/
 static void Version( void )
 {
+    extern const char psz_vlc_changeset[];
 #ifdef WIN32
     ShowConsole( true );
 #endif
 
-    utf8_fprintf( stdout, _("VLC version %s\n"), VLC_Version() );
+    utf8_fprintf( stdout, _("VLC version %s (%s)\n"), VLC_Version(),
+                  psz_vlc_changeset );
     utf8_fprintf( stdout, _("Compiled by %s@%s.%s\n"),
              VLC_CompileBy(), VLC_CompileHost(), VLC_CompileDomain() );
     utf8_fprintf( stdout, _("Compiler: %s\n"), VLC_Compiler() );