X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Flibvlc-common.c;h=a0785a78d023027fd403a7f1e837441dc9bde242;hb=751d2f1a63d1d4fe2ea19c6b10b176a98bc46615;hp=8803b76ab71092076dc9c350f329b9ef4d2b2a95;hpb=3d0196c72e0e16b1aabb7e4f105db370b206957c;p=vlc diff --git a/src/libvlc-common.c b/src/libvlc-common.c index 8803b76ab7..a0785a78d0 100644 --- a/src/libvlc-common.c +++ b/src/libvlc-common.c @@ -32,12 +32,16 @@ /***************************************************************************** * Preamble *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include #include "control/libvlc_internal.h" #include #include "modules/modules.h" -#include "config/config.h" +#include "config/configuration.h" #include /* ENOMEM */ #include /* sprintf() */ @@ -94,7 +98,7 @@ * The evil global variable. We handle it with care, don't worry. *****************************************************************************/ static libvlc_global_data_t libvlc_global; -#define p_libvlc_global (&libvlc_global) +static libvlc_global_data_t *p_libvlc_global = &libvlc_global; static libvlc_int_t * p_static_vlc = NULL; static volatile unsigned int i_instances = 0; @@ -135,12 +139,7 @@ libvlc_global_data_t *vlc_global( void ) *****************************************************************************/ libvlc_int_t * vlc_current_object( int i_object ) { - if( i_object ) - { - return vlc_object_get( p_libvlc_global, i_object ); - } - - return p_static_vlc; + return i_object ? vlc_object_get( i_object ) : p_static_vlc; } @@ -214,8 +213,6 @@ 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 ); - if( strcmp( p_libvlc->psz_object_name, "cvlc" ) ) /* Not running with cvlc */ - 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 ); @@ -295,14 +292,14 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, } /* Check for short help option */ - if( config_GetInt( p_libvlc, "help" ) ) + if( config_GetInt( p_libvlc, "help" ) > 0 ) { Help( p_libvlc, "help" ); b_exit = VLC_TRUE; i_ret = VLC_EEXITSUCCESS; } /* Check for version option */ - else if( config_GetInt( p_libvlc, "version" ) ) + else if( config_GetInt( p_libvlc, "version" ) > 0 ) { Version(); b_exit = VLC_TRUE; @@ -317,7 +314,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, p_libvlc->psz_configfile = config_GetCustomConfigFile( p_libvlc ); /* Check for plugins cache options */ - if( config_GetInt( p_libvlc, "reset-plugins-cache" ) ) + if( config_GetInt( p_libvlc, "reset-plugins-cache" ) > 0 ) { libvlc_global.p_module_bank->b_cache_delete = VLC_TRUE; } @@ -329,7 +326,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, #ifndef WIN32 if( config_GetInt( p_libvlc, "daemon" ) ) { -#if HAVE_DAEMON +#ifdef HAVE_DAEMON char *psz_pidfile = NULL; if( daemon( 1, 0) != 0 ) @@ -452,20 +449,20 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, i_ret = VLC_EEXITSUCCESS; } /* Check for long help option */ - else if( config_GetInt( p_libvlc, "longhelp" ) ) + else if( config_GetInt( p_libvlc, "longhelp" ) > 0 ) { Help( p_libvlc, "longhelp" ); b_exit = VLC_TRUE; i_ret = VLC_EEXITSUCCESS; } /* Check for module list option */ - else if( config_GetInt( p_libvlc, "list" ) ) + else if( config_GetInt( p_libvlc, "list" ) > 0 ) { ListModules( p_libvlc, VLC_FALSE ); b_exit = VLC_TRUE; i_ret = VLC_EEXITSUCCESS; } - else if( config_GetInt( p_libvlc, "list-verbose" ) ) + else if( config_GetInt( p_libvlc, "list-verbose" ) > 0 ) { ListModules( p_libvlc, VLC_TRUE ); b_exit = VLC_TRUE; @@ -473,13 +470,13 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, } /* Check for config file options */ - if( config_GetInt( p_libvlc, "reset-config" ) ) + if( config_GetInt( p_libvlc, "reset-config" ) > 0 ) { config_ResetAll( p_libvlc ); config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE ); config_SaveConfigFile( p_libvlc, NULL ); } - if( config_GetInt( p_libvlc, "save-config" ) ) + if( config_GetInt( p_libvlc, "save-config" ) > 0 ) { config_LoadConfigFile( p_libvlc, NULL ); config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, VLC_TRUE ); @@ -527,7 +524,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, #ifdef HAVE_DBUS_3 dbus_threads_init_default(); - if( config_GetInt( p_libvlc, "one-instance" ) ) + if( config_GetInt( p_libvlc, "one-instance" ) > 0 ) { /* Initialise D-Bus interface, check for other instances */ DBusConnection *p_conn = NULL; @@ -601,7 +598,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, exit( VLC_ENOMEM ); } b_play = TRUE; - if( config_GetInt( p_libvlc, "playlist-enqueue" ) ) + if( config_GetInt( p_libvlc, "playlist-enqueue" ) > 0 ) b_play = FALSE; if ( !dbus_message_iter_append_basic( &dbus_args, DBUS_TYPE_BOOLEAN, &b_play ) ) @@ -651,7 +648,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, */ var_Create( p_libvlc, "verbose", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - if( config_GetInt( p_libvlc, "quiet" ) ) + if( config_GetInt( p_libvlc, "quiet" ) > 0 ) { val.i_int = -1; var_Set( p_libvlc, "verbose", val ); @@ -659,7 +656,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, var_AddCallback( p_libvlc, "verbose", VerboseCallback, NULL ); var_Change( p_libvlc, "verbose", VLC_VAR_TRIGGER_CALLBACKS, NULL, NULL ); - p_libvlc->b_color = p_libvlc->b_color && config_GetInt( p_libvlc, "color" ); + if( p_libvlc->b_color ) + p_libvlc->b_color = config_GetInt( p_libvlc, "color" ) > 0; /* * Output messages that may still be in the queue @@ -722,7 +720,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, p_libvlc->pf_memset = memset; } - p_libvlc->b_stats = config_GetInt( p_libvlc, "stats" ); + p_libvlc->b_stats = config_GetInt( p_libvlc, "stats" ) > 0; p_libvlc->i_timers = 0; p_libvlc->pp_timers = NULL; vlc_mutex_init( p_libvlc, &p_libvlc->timer_lock ); @@ -805,12 +803,12 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, #ifdef HAVE_DBUS_3 /* loads dbus control interface if in one-instance mode * we do it only when playlist exists, because dbus module needs it */ - if( config_GetInt( p_libvlc, "one-instance" ) ) + if( config_GetInt( p_libvlc, "one-instance" ) > 0 ) 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" ) ) + if( config_GetInt( p_libvlc, "inhibit" ) > 0 ) VLC_AddIntf( 0, "inhibit,none", VLC_FALSE, VLC_FALSE ); #endif @@ -819,18 +817,18 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, * Currently, only for X */ #ifdef HAVE_X11_XLIB_H - if( config_GetInt( p_libvlc, "disable-screensaver" ) == 1 ) + if( config_GetInt( p_libvlc, "disable-screensaver" ) ) { VLC_AddIntf( 0, "screensaver,none", VLC_FALSE, VLC_FALSE ); } #endif - if( config_GetInt( p_libvlc, "file-logging" ) == 1 ) + if( config_GetInt( p_libvlc, "file-logging" ) > 0 ) { VLC_AddIntf( 0, "logger,none", VLC_FALSE, VLC_FALSE ); } #ifdef HAVE_SYSLOG_H - if( config_GetInt( p_libvlc, "syslog" ) == 1 ) + if( config_GetInt( p_libvlc, "syslog" ) > 0 ) { const char *psz_logmode = "logmode=syslog"; libvlc_InternalAddIntf( p_libvlc, "logger,none", VLC_FALSE, VLC_FALSE, @@ -838,18 +836,18 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, } #endif - if( config_GetInt( p_libvlc, "show-intf" ) == 1 ) + if( config_GetInt( p_libvlc, "show-intf" ) > 0 ) { VLC_AddIntf( 0, "showintf,none", VLC_FALSE, VLC_FALSE ); } - if( config_GetInt( p_libvlc, "network-synchronisation") == 1 ) + if( config_GetInt( p_libvlc, "network-synchronisation") > 0 ) { VLC_AddIntf( 0, "netsync,none", VLC_FALSE, VLC_FALSE ); } #ifdef WIN32 - if( config_GetInt( p_libvlc, "prefer-system-codecs") == 1 ) + if( config_GetInt( p_libvlc, "prefer-system-codecs") > 0 ) { char *psz_codecs = config_GetPsz( p_playlist, "codec" ); if( psz_codecs ) @@ -982,7 +980,7 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, vlc_bool_t b_release ) char* psz_pidfile = NULL; if( libvlc_global.p_module_bank ) - if( config_GetInt( p_libvlc, "daemon" ) ) + if( config_GetInt( p_libvlc, "daemon" ) > 0 ) { psz_pidfile = config_GetPsz( p_libvlc, "pidfile" ); if( psz_pidfile != NULL ) @@ -1060,6 +1058,14 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, if( !p_libvlc ) return VLC_EGENERIC; + if( !psz_module ) /* requesting the default interface */ + { + char *psz_interface = config_GetPsz( p_libvlc, "intf" ); + if( !psz_interface || !*psz_interface ) /* "intf" has not been set */ + msg_Info( p_libvlc, _("Running vlc with the default interface. Use 'cvlc' to use vlc without interface.") ); + free( psz_interface ); + } + #ifndef WIN32 if( libvlc_global.b_daemon && b_block && !psz_module ) { @@ -1279,7 +1285,7 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) # define BLUE COL(34) # define MAGENTA COL(35) # define CYAN COL(36) -# define WHITE COL(37) +# define WHITE COL(0) # 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) @@ -1301,10 +1307,11 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) int i_index; int i_width = ConsoleWidth() - (PADDING_SPACES+LINE_START+1); int i_width_description = i_width + PADDING_SPACES - 1; - vlc_bool_t b_advanced = config_GetInt( p_this, "advanced" ); - vlc_bool_t b_description = config_GetInt( p_this, "help-verbose" ); + vlc_bool_t b_advanced = config_GetInt( p_this, "advanced" ) > 0; + vlc_bool_t b_description = config_GetInt( p_this, "help-verbose" ) > 0; vlc_bool_t b_description_hack; - vlc_bool_t b_color = config_GetInt( p_this, "color" ); + vlc_bool_t b_color = config_GetInt( p_this, "color" ) > 0; + vlc_bool_t b_has_advanced = VLC_FALSE; memset( psz_spaces_text, ' ', PADDING_SPACES+LINE_START ); psz_spaces_text[PADDING_SPACES+LINE_START] = '\0'; @@ -1412,6 +1419,7 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) /* Skip advanced options if requested */ if( p_item->b_advanced && !b_advanced ) { + b_has_advanced = VLC_TRUE; continue; } @@ -1464,6 +1472,8 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) case CONFIG_ITEM_MODULE_CAT: case CONFIG_ITEM_MODULE_LIST: case CONFIG_ITEM_MODULE_LIST_CAT: + case CONFIG_ITEM_FONT: + case CONFIG_ITEM_PASSWORD: psz_bra = OPTION_VALUE_SEP "<"; psz_type = _("string"); psz_ket = ">"; @@ -1681,6 +1691,10 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name ) } } + if( b_has_advanced ) + utf8_fprintf( stdout, "\n" WHITE "%s" GRAY " %s\n", _( "Note:" ), + _( "add --advanced to your command line to see advanced options." ) ); + /* Release the module list */ vlc_list_release( p_list ); } @@ -1698,7 +1712,7 @@ static void ListModules( libvlc_int_t *p_this, vlc_bool_t b_verbose ) char psz_spaces[22]; int i_index; - vlc_bool_t b_color = config_GetInt( p_this, "color" ); + vlc_bool_t b_color = config_GetInt( p_this, "color" ) > 0; memset( psz_spaces, ' ', 22 ); @@ -1810,6 +1824,11 @@ static void ShowConsole( vlc_bool_t b_dofile ) if( getenv( "PWD" ) && getenv( "PS1" ) ) return; /* cygwin shell */ AllocConsole(); + /* Use the ANSI code page (e.g. Windows-1252) as expected by the LibVLC + * Unicode/locale subsystem. By default, we have the obsolecent OEM code + * page (e.g. CP437 or CP850). */ + SetConsoleOutputCP (GetACP ()); + SetConsoleTitle ("VLC media player version "PACKAGE_VERSION); freopen( "CONOUT$", "w", stderr ); freopen( "CONIN$", "r", stdin ); @@ -1854,34 +1873,21 @@ static void PauseConsole( void ) *****************************************************************************/ static int ConsoleWidth( void ) { - int i_width = 80; + unsigned i_width = 80; #ifndef WIN32 - char buf[20]; - char *psz_parser = NULL; - FILE *file = NULL; - int i_ret; - - file = popen( "stty size 2>/dev/null", "r" ); - if( file ) + FILE *file = popen( "stty size 2>/dev/null", "r" ); + if (file != NULL) { - i_ret = fread( buf, 1, 20, file ); - if( i_ret > 0 ) - { - buf[19] = '\0'; - psz_parser = strchr( buf, ' ' ); - if( psz_parser ) - { - i_ret = atoi( psz_parser + 1 ); - if( i_ret >= 80 ) - { - i_width = i_ret; - } - } - } - + if (fscanf (file, "%*u %u", &i_width) <= 0) + i_width = 80; pclose( file ); } +#else + CONSOLE_SCREEN_BUFFER_INFO buf; + + if (GetConsoleScreenBufferInfo (GetStdHandle (STD_OUTPUT_HANDLE), &buf)) + i_width = buf.dwSize.X; #endif return i_width;