src/libvlc-common.c: Print a msg_Info on how to launch VLC without interface.

[vlc] / src / libvlc-common.c

diff --git a/src/libvlc-common.c b/src/libvlc-common.c
index e00ad5a5e6d5343a02de7411804be40faaa9ad9b..2c83d899054b12b3fdacd4a7bd69c5b3a4c60e26 100644 (file)
--- a/src/libvlc-common.c
+++ b/src/libvlc-common.c
@@ -105,7 +105,7 @@ static volatile unsigned int i_instances = 0;
 static void SetLanguage   ( char const * );
 #endif
 static inline int LoadMessages (void);
-static int  GetFilenames  ( libvlc_int_t *, int, char *[] );
+static int  GetFilenames  ( libvlc_int_t *, int, const char *[] );
 static void Help          ( libvlc_int_t *, char const *psz_help_name );
 static void Usage         ( libvlc_int_t *, char const *psz_module_name );
 static void ListModules   ( libvlc_int_t *, vlc_bool_t );
@@ -214,6 +214,7 @@ libvlc_int_t * libvlc_InternalCreate( void )
     /* 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 );
+    msg_Info( p_libvlc, "Running vlc with the default interface. Use 'cvlc' to use vlc without interface.");
 
     /* Initialize mutexes */
     vlc_mutex_init( p_libvlc, &p_libvlc->config_lock );
@@ -235,7 +236,8 @@ libvlc_int_t * libvlc_InternalCreate( void )
  *  - message queue, module bank and playlist initialization
  *  - configuration and commandline parsing
  */
-int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] )
+int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
+                         const char *ppsz_argv[] )
 {
     char         p_capabilities[200];
     char *       p_tmp = NULL;
@@ -818,7 +820,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 );
     }
 
@@ -841,10 +843,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
@@ -856,6 +856,11 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] )
      * we do it only when playlist exists, because dbus module needs it */
     if( config_GetInt( p_libvlc, "one-instance" ) )
         VLC_AddIntf( 0, "dbus,none", VLC_FALSE, VLC_FALSE );
+
+    /* Prevents the power management daemon to suspend the computer
+     * when VLC is active */
+    if( config_GetInt( p_libvlc, "inhibit" ) )
+        VLC_AddIntf( 0, "inhibit,none", VLC_FALSE, VLC_FALSE );
 #endif
 
     /*
@@ -1132,7 +1137,7 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc,
     /* Try to run the interface */
     p_intf->b_play = b_play;
     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 );
@@ -1235,7 +1240,7 @@ static inline int LoadMessages (void)
  * Parse command line for input files as well as their associated options.
  * An option always follows its associated input and begins with a ":".
  *****************************************************************************/
-static int GetFilenames( libvlc_int_t *p_vlc, int i_argc, char *ppsz_argv[] )
+static int GetFilenames( libvlc_int_t *p_vlc, int i_argc, const char *ppsz_argv[] )
 {
     int i_opt, i_options;
 
@@ -1256,7 +1261,7 @@ static int GetFilenames( libvlc_int_t *p_vlc, int i_argc, char *ppsz_argv[] )
          *       unnecessary lookups. */
 
         VLC_AddTarget( p_vlc->i_object_id, ppsz_argv[i_opt],
-                       (char const **)( i_options ? &ppsz_argv[i_opt + 1] :
+                       ( i_options ? &ppsz_argv[i_opt + 1] :
                                         NULL ), i_options,
                        PLAYLIST_INSERT, 0 );
     }
@@ -1326,6 +1331,7 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name )
 #   define WHITE   COL(37)
 #   define GRAY    "\033[0m"
 #define COLOR_FORMAT_STRING (WHITE"  %s --%s"YELLOW"%s%s%s%s%s%s "GRAY)
+#define COLOR_FORMAT_STRING_BOOL (WHITE"  %s --%s%s%s%s%s%s%s "GRAY)
 
 #define LINE_START 8
 #define PADDING_SPACES 25
@@ -1338,6 +1344,7 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name )
     char psz_spaces_text[PADDING_SPACES+LINE_START+1];
     char psz_spaces_longtext[LINE_START+3];
     char psz_format[sizeof(COLOR_FORMAT_STRING)];
+    char psz_format_bool[sizeof(COLOR_FORMAT_STRING_BOOL)];
     char psz_buffer[10000];
     char psz_short[4];
     int i_index;
@@ -1354,9 +1361,15 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name )
     psz_spaces_longtext[LINE_START+2] = '\0';
 
     if( b_color )
+    {
         strcpy( psz_format, COLOR_FORMAT_STRING );
+        strcpy( psz_format_bool, COLOR_FORMAT_STRING_BOOL );
+    }
     else
+    {
         strcpy( psz_format, FORMAT_STRING );
+        strcpy( psz_format_bool, FORMAT_STRING );
+    }
 
     /* List all modules */
     p_list = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
@@ -1603,9 +1616,9 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name )
 
             if( p_item->i_type == CONFIG_ITEM_BOOL && !b_help_module )
             {
-                utf8_fprintf( stdout, psz_format, psz_short, p_item->psz_name,
-                         psz_prefix, p_item->psz_name, psz_bra, psz_type,
-                         psz_ket, psz_spaces );
+                utf8_fprintf( stdout, psz_format_bool, psz_short, 
+                              p_item->psz_name, psz_prefix, p_item->psz_name,
+                              psz_bra, psz_type, psz_ket, psz_spaces );
             }
             else
             {