X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.c;h=c3087573effd011e093f40c29cfd77f338dd53a8;hb=1b7540c4e7db9d419566bf36aac08aaa6f559895;hp=cc67a3b31a3a57362acdd2f477098f22793be4ed;hpb=97c94423c20099d71a48dc6ed737dcd1c43a1eff;p=vlc diff --git a/src/libvlc.c b/src/libvlc.c index cc67a3b31a..c3087573ef 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -369,7 +369,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, b_daemon = true; /* lets check if we need to write the pidfile */ - psz_pidfile = config_GetPsz( p_libvlc, "pidfile" ); + psz_pidfile = var_CreateGetNonEmptyString( p_libvlc, "pidfile" ); if( psz_pidfile != NULL ) { FILE *pidfile; @@ -438,8 +438,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, priv->i_verbose = config_GetInt( p_libvlc, "verbose" ); /* Check if the user specified a custom language */ - psz_language = config_GetPsz( p_libvlc, "language" ); - if( psz_language && *psz_language && strcmp( psz_language, "auto" ) ) + psz_language = var_CreateGetNonEmptyString( p_libvlc, "language" ); + if( psz_language && strcmp( psz_language, "auto" ) ) { /* Reset the default domain */ SetLanguage( psz_language ); @@ -476,7 +476,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, msg_Dbg( p_libvlc, "module bank initialized (%zu modules)", module_count ); /* Check for help on modules */ - if( (p_tmp = config_GetPsz( p_libvlc, "module" )) ) + if( (p_tmp = var_CreateGetNonEmptyString( p_libvlc, "module" )) ) { Help( p_libvlc, p_tmp ); free( p_tmp ); @@ -530,6 +530,14 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, } } + if( module_count <= 1) + { + msg_Err( p_libvlc, "No modules were found, refusing to start. Check " + "that you properly gave a module path with --plugin-path."); + b_exit = true; + i_ret = VLC_ENOITEM; + } + if( b_exit ) { module_EndBank( p_libvlc, true ); @@ -690,7 +698,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* * Message queue options */ - char * psz_verbose_objects = config_GetPsz( p_libvlc, "verbose-objects" ); + char * psz_verbose_objects = var_CreateGetNonEmptyString( p_libvlc, "verbose-objects" ); if( psz_verbose_objects ) { char * psz_object, * iter = psz_verbose_objects; @@ -750,6 +758,12 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, cpu_flags &= ~CPU_CAPABILITY_SSE2; if( !config_GetInt( p_libvlc, "sse3" ) ) cpu_flags &= ~CPU_CAPABILITY_SSE3; + if( !config_GetInt( p_libvlc, "ssse3" ) ) + cpu_flags &= ~CPU_CAPABILITY_SSSE3; + if( !config_GetInt( p_libvlc, "sse41" ) ) + cpu_flags &= ~CPU_CAPABILITY_SSE4_1; + if( !config_GetInt( p_libvlc, "sse42" ) ) + cpu_flags &= ~CPU_CAPABILITY_SSE4_2; PRINT_CAPABILITY( CPU_CAPABILITY_MMX, "MMX" ); PRINT_CAPABILITY( CPU_CAPABILITY_3DNOW, "3DNow!" ); @@ -757,6 +771,10 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, PRINT_CAPABILITY( CPU_CAPABILITY_SSE, "SSE" ); PRINT_CAPABILITY( CPU_CAPABILITY_SSE2, "SSE2" ); PRINT_CAPABILITY( CPU_CAPABILITY_SSE3, "SSE3" ); + PRINT_CAPABILITY( CPU_CAPABILITY_SSE3, "SSSE3" ); + PRINT_CAPABILITY( CPU_CAPABILITY_SSE4_1, "SSE4.1" ); + PRINT_CAPABILITY( CPU_CAPABILITY_SSE4_2, "SSE4.2" ); + PRINT_CAPABILITY( CPU_CAPABILITY_SSE4A, "SSE4A" ); #elif defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc64__ ) if( !config_GetInt( p_libvlc, "altivec" ) ) @@ -799,13 +817,22 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, struct hotkey *p_keys = malloc( (libvlc_actions_count + 1) * sizeof (*p_keys) ); - /* Initialize from configuration */ + /* Initialize from configuration */ for( size_t i = 0; i < libvlc_actions_count; i++ ) { p_keys[i].psz_action = libvlc_actions[i].name; p_keys[i].i_key = config_GetInt( p_libvlc, libvlc_actions[i].name ); p_keys[i].i_action = libvlc_actions[i].value; +#ifndef NDEBUG + if (i > 0 + && strcmp(libvlc_actions[i-1].name, libvlc_actions[i].name) >= 0) + { + msg_Err(p_libvlc, "%s and %s are not ordered properly", + libvlc_actions[i-1].name, libvlc_actions[i].name); + abort(); + } +#endif } p_keys[libvlc_actions_count].psz_action = NULL; p_keys[libvlc_actions_count].i_key = 0; @@ -835,8 +862,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, vlc_object_attach( p_playlist, p_libvlc ); /* Add service discovery modules */ - psz_modules = config_GetPsz( p_playlist, "services-discovery" ); - if( psz_modules && *psz_modules ) + psz_modules = var_CreateGetNonEmptyString( p_playlist, "services-discovery" ); + if( psz_modules ) { char *p = psz_modules, *m; while( ( m = strsep( &p, " :," ) ) != NULL ) @@ -846,8 +873,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, #ifdef ENABLE_VLM /* Initialize VLM if vlm-conf is specified */ - psz_parser = config_GetPsz( p_libvlc, "vlm-conf" ); - if( psz_parser && *psz_parser ) + psz_parser = var_CreateGetNonEmptyString( p_libvlc, "vlm-conf" ); + if( psz_parser ) { priv->p_vlm = vlm_New( p_libvlc ); if( !priv->p_vlm ) @@ -863,10 +890,10 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, all interfaces as they can use it) */ var_Create( p_libvlc, "volume-change", VLC_VAR_BOOL ); - psz_modules = config_GetPsz( p_libvlc, "extraintf" ); - psz_control = config_GetPsz( p_libvlc, "control" ); + psz_modules = var_CreateGetNonEmptyString( p_libvlc, "extraintf" ); + psz_control = var_CreateGetNonEmptyString( p_libvlc, "control" ); - if( psz_modules && *psz_modules && psz_control && *psz_control ) + if( psz_modules && psz_control ) { char* psz_tmp; if( asprintf( &psz_tmp, "%s:%s", psz_modules, psz_control ) != -1 ) @@ -875,7 +902,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, psz_modules = psz_tmp; } } - else if( psz_control && *psz_control ) + else if( psz_control ) { free( psz_modules ); psz_modules = strdup( psz_control ); @@ -930,7 +957,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, #ifdef HAVE_SYSLOG_H if( config_GetInt( p_libvlc, "syslog" ) > 0 ) { - char *logmode = var_CreateGetString( p_libvlc, "logmode" ); + char *logmode = var_CreateGetNonEmptyString( p_libvlc, "logmode" ); var_SetString( p_libvlc, "logmode", "syslog" ); intf_Create( p_libvlc, "logger,none" ); @@ -939,8 +966,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, var_SetString( p_libvlc, "logmode", logmode ); free( logmode ); } - else - var_Destroy( p_libvlc, "logmode" ); + var_Destroy( p_libvlc, "logmode" ); } #endif @@ -952,19 +978,19 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, #ifdef WIN32 if( config_GetInt( p_libvlc, "prefer-system-codecs") > 0 ) { - char *psz_codecs = config_GetPsz( p_playlist, "codec" ); + char *psz_codecs = var_CreateGetNonEmptyString( p_playlist, "codec" ); if( psz_codecs ) { char *psz_morecodecs; if( asprintf(&psz_morecodecs, "%s,dmo,quicktime", psz_codecs) != -1 ) { - config_PutPsz( p_libvlc, "codec", psz_morecodecs); + var_SetString( p_libvlc, "codec", psz_morecodecs); free( psz_morecodecs ); } + free( psz_codecs ); } else - config_PutPsz( p_libvlc, "codec", "dmo,quicktime"); - free( psz_codecs ); + var_SetString( p_libvlc, "codec", "dmo,quicktime"); } #endif @@ -993,8 +1019,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, /* * Get --open argument */ - psz_val = var_CreateGetString( p_libvlc, "open" ); - if ( psz_val != NULL && *psz_val ) + psz_val = var_CreateGetNonEmptyString( p_libvlc, "open" ); + if ( psz_val != NULL ) { playlist_t *p_playlist = pl_Hold( p_libvlc ); playlist_AddExt( p_playlist, psz_val, NULL, PLAYLIST_INSERT, 0, @@ -1055,7 +1081,7 @@ void libvlc_InternalCleanup( libvlc_int_t *p_libvlc ) if( b_daemon ) { - psz_pidfile = config_GetPsz( p_libvlc, "pidfile" ); + psz_pidfile = var_CreateGetNonEmptyString( p_libvlc, "pidfile" ); if( psz_pidfile != NULL ) { msg_Dbg( p_libvlc, "removing pid file %s", psz_pidfile ); @@ -1130,8 +1156,8 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, char const *psz_module ) 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 */ + char *psz_interface = var_CreateGetNonEmptyString( p_libvlc, "intf" ); + if( !psz_interface ) /* "intf" has not been set */ { #ifndef WIN32 if( b_daemon ) @@ -1148,13 +1174,12 @@ int libvlc_InternalAddIntf( libvlc_int_t *p_libvlc, char const *psz_module ) } /* Try to create the interface */ - if( intf_Create( p_libvlc, psz_module ? psz_module : "$intf" ) ) - { + int ret = intf_Create( p_libvlc, psz_module ? psz_module : "$intf" ); + if( ret ) msg_Err( p_libvlc, "interface \"%s\" initialization failed", psz_module ? psz_module : "default" ); - return VLC_EGENERIC; - } - return VLC_SUCCESS; + var_Destroy( p_libvlc, "intf" ); + return ret; } static vlc_mutex_t exit_lock = VLC_STATIC_MUTEX; @@ -1229,7 +1254,7 @@ static inline int LoadMessages (void) #else char psz_path[1024]; if (snprintf (psz_path, sizeof (psz_path), "%s" DIR_SEP "%s", - config_GetDataDir(), "locale") + config_GetDataDirDefault(), "locale") >= (int)sizeof (psz_path)) return -1; @@ -1899,14 +1924,15 @@ static void Usage( libvlc_int_t *p_this, char const *psz_search ) static void ListModules( libvlc_int_t *p_this, bool b_verbose ) { module_t *p_parser; - char psz_spaces[22]; bool b_color = config_GetInt( p_this, "color" ) > 0; - memset( psz_spaces, ' ', 22 ); - #ifdef WIN32 ShowConsole( true ); + b_color = false; // don't put color control codes in a .txt file +#else + if( !isatty( 1 ) ) + b_color = false; #endif /* List all modules */ @@ -1915,22 +1941,14 @@ static void ListModules( libvlc_int_t *p_this, bool b_verbose ) /* Enumerate each module */ for (size_t j = 0; (p_parser = list[j]) != NULL; j++) { - int i; - - /* Nasty hack, but right now I'm too tired to think about a nice - * solution */ - i = 22 - strlen( p_parser->psz_object_name ) - 1; - if( i < 0 ) i = 0; - psz_spaces[i] = 0; - if( b_color ) - utf8_fprintf( stdout, GREEN" %s%s "WHITE"%s\n"GRAY, + utf8_fprintf( stdout, GREEN" %-22s "WHITE"%s\n"GRAY, p_parser->psz_object_name, - psz_spaces, _( p_parser->psz_longname ) ); + _( p_parser->psz_longname ) ); else - utf8_fprintf( stdout, " %s%s %s\n", + utf8_fprintf( stdout, " %-22s %s\n", p_parser->psz_object_name, - psz_spaces, _( p_parser->psz_longname ) ); + _( p_parser->psz_longname ) ); if( b_verbose ) { @@ -1960,8 +1978,6 @@ static void ListModules( libvlc_int_t *p_this, bool b_verbose ) p_parser->i_score ); } } - - psz_spaces[i] = ' '; } module_list_free (list);